diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 1d14bfd61806a81cac02b9bfaab8b45464cb48a7..eaf26f9de0a3759cfdbda19ae85922c20a9467d0 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -7749,7 +7749,7 @@ dependencies = [
 
 [[package]]
 name = "prioritized-metered-channel"
-version = "0.1.1"
+version = "0.2.0"
 dependencies = [
  "assert_matches",
  "coarsetime",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 70aa3f77c3294b874fbd001ad518c6c0cbf756da..9b8aeed34fe24cdfd19462755870bc286e2cc03e 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -83,8 +83,8 @@ members = [
 	"node/network/gossip-support",
 	"node/network/dispute-distribution",
 	"node/overseer",
-	"node/overseer/orchestra",
-	"node/overseer/orchestra/proc-macro",
+	"node/orchestra",
+	"node/orchestra/proc-macro",
 	"node/malus",
 	"node/primitives",
 	"node/service",
diff --git a/polkadot/node/metered-channel/Cargo.toml b/polkadot/node/metered-channel/Cargo.toml
index 97b9d971cda391f0ef7be62325f64189d2a1ece5..f306f07eeeaf937e764dd4f7d30d7a773b3f1c88 100644
--- a/polkadot/node/metered-channel/Cargo.toml
+++ b/polkadot/node/metered-channel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prioritized-metered-channel"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 description = "Channels with built-in observability and message priorizitazion (coming soonâ„¢)"
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index 67d3e90d4adbf8c9374aca5e6691c87c84c75f3b..b9621fd5c4bbabac1e7fae7828aa4efdc368e215 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -10,7 +10,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 gum = { package = "tracing-gum", path = "../gum" }
 
-metered = { package = "prioritized-metered-channel", path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" , "version" = "0.2.0" }
 
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/overseer/orchestra/Cargo.toml b/polkadot/node/orchestra/Cargo.toml
similarity index 95%
rename from polkadot/node/overseer/orchestra/Cargo.toml
rename to polkadot/node/orchestra/Cargo.toml
index 7f9e9567326fbaf57bb98e8e5cdf54bb5f3d3c07..67b16a244ad2cb2f3ecb2f6eece88ace9db14131 100644
--- a/polkadot/node/overseer/orchestra/Cargo.toml
+++ b/polkadot/node/orchestra/Cargo.toml
@@ -13,7 +13,7 @@ tracing = "0.1.34"
 futures = "0.3"
 async-trait = "0.1"
 thiserror = "1"
-metered = { package = "prioritized-metered-channel", version = "0.1.1", path = "../../metered-channel" }
+metered = { package = "prioritized-metered-channel", version = "0.2.0", path = "../metered-channel" }
 orchestra-proc-macro = { version = "0.0.1", path = "./proc-macro" }
 futures-timer = "3.0.2"
 pin-project = "1.0"
diff --git a/polkadot/node/overseer/orchestra/README.md b/polkadot/node/orchestra/README.md
similarity index 95%
rename from polkadot/node/overseer/orchestra/README.md
rename to polkadot/node/orchestra/README.md
index 46106d40f82a058a8f4a211165a888b6f6e13ab6..2cfe4bb0a8849197e41b0c3d51879ebd7d9f4b55 100644
--- a/polkadot/node/overseer/orchestra/README.md
+++ b/polkadot/node/orchestra/README.md
@@ -88,3 +88,12 @@ As always, debugging is notoriously annoying with bugged proc-macros.
 
 Therefore [`expander`](https://github.com/drahnr/expander) is employed to yield better
 error messages. Enable with `--feature=orchestra/expand`.
+
+## License
+
+Licensed under either of
+
+* Apache License, Version 2.0, (LICENSE-APACHE or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license (LICENSE-MIT or <http://opensource.org/licenses/MIT>)
+
+at your option.
diff --git a/polkadot/node/overseer/orchestra/adr/01-adr.md b/polkadot/node/orchestra/adr/01-adr.md
similarity index 100%
rename from polkadot/node/overseer/orchestra/adr/01-adr.md
rename to polkadot/node/orchestra/adr/01-adr.md
diff --git a/polkadot/node/overseer/orchestra/examples/duo.rs b/polkadot/node/orchestra/examples/duo.rs
similarity index 76%
rename from polkadot/node/overseer/orchestra/examples/duo.rs
rename to polkadot/node/orchestra/examples/duo.rs
index 7e5cc32cd8acfb549af09a8e999efb485a1ad02f..0b9f269b3c284d93ab5587d3c69896a4c0ce294d 100644
--- a/polkadot/node/overseer/orchestra/examples/duo.rs
+++ b/polkadot/node/orchestra/examples/duo.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![allow(dead_code)] // orchestra events are not used
 
 //! A dummy to be used with cargo expand
diff --git a/polkadot/node/overseer/orchestra/examples/misc.rs b/polkadot/node/orchestra/examples/misc.rs
similarity index 68%
rename from polkadot/node/overseer/orchestra/examples/misc.rs
rename to polkadot/node/orchestra/examples/misc.rs
index 39a755c5d0fc00fdf32c1ea2965c3d490418e9d8..ffd5001d07bd9c78d44c8b6cb9f81883e56a21d2 100644
--- a/polkadot/node/overseer/orchestra/examples/misc.rs
+++ b/polkadot/node/orchestra/examples/misc.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use orchestra::{Spawner, *};
 
 #[derive(Debug, Clone, Copy)]
diff --git a/polkadot/node/overseer/orchestra/examples/solo.rs b/polkadot/node/orchestra/examples/solo.rs
similarity index 64%
rename from polkadot/node/overseer/orchestra/examples/solo.rs
rename to polkadot/node/orchestra/examples/solo.rs
index 2ca53cb648681f78a8f4425252a42aaec4e3461a..67ebc292e46d662cfd2b63f4761278783e26d406 100644
--- a/polkadot/node/overseer/orchestra/examples/solo.rs
+++ b/polkadot/node/orchestra/examples/solo.rs
@@ -1,3 +1,18 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #![allow(dead_code)] // orchestra events are not used
 
 //! A minimal demo to be used with cargo expand.
diff --git a/polkadot/node/overseer/orchestra/proc-macro/Cargo.toml b/polkadot/node/orchestra/proc-macro/Cargo.toml
similarity index 100%
rename from polkadot/node/overseer/orchestra/proc-macro/Cargo.toml
rename to polkadot/node/orchestra/proc-macro/Cargo.toml
diff --git a/polkadot/node/overseer/orchestra/proc-macro/build.rs b/polkadot/node/orchestra/proc-macro/build.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/proc-macro/build.rs
rename to polkadot/node/orchestra/proc-macro/build.rs
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs b/polkadot/node/orchestra/proc-macro/src/impl_builder.rs
similarity index 97%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_builder.rs
index 89515e0d1048efe1d5e54d1ba44916f6a395dd14..d5a91782e8f168f4a247a02bd485351c0124a2b0 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_builder.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_builder.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use quote::{format_ident, quote};
 use syn::{parse_quote, Path, PathSegment};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs b/polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
similarity index 83%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
index d697ff34da97aa35afbe94de758b4caa506cb8ab..5b694d15229dc1ef5bf85529de3303d891fc9df0 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_channels_out.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_channels_out.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use quote::quote;
 use syn::Result;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs b/polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
similarity index 69%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
index 19d57a69cf10d51788f557c0ba4058cd675c9de3..3c2f999992088c977f2263981daddb128ff6e4d4 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_message_wrapper.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_message_wrapper.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use quote::quote;
 use syn::{spanned::Spanned, Result};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs b/polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
similarity index 91%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
index 11af31d00d208ad0d8aae2528b72df379fb86a3d..62dc27e84573c61bdd37827e93dae66f4d333f5c 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_orchestra.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_orchestra.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use quote::quote;
 
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs b/polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
similarity index 96%
rename from polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
rename to polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
index 7987a60ba1ec2423e95d4bbffd14094469f59f2b..fb2a4988dc4623a791feab1ea70bcf0c5d2ebc13 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
+++ b/polkadot/node/orchestra/proc-macro/src/impl_subsystem_ctx_sender.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use proc_macro2::TokenStream;
 use quote::quote;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/lib.rs b/polkadot/node/orchestra/proc-macro/src/lib.rs
similarity index 73%
rename from polkadot/node/overseer/orchestra/proc-macro/src/lib.rs
rename to polkadot/node/orchestra/proc-macro/src/lib.rs
index cd0dcf3a4225c5831cc775825b45f94bb4a5d1a6..121eda0903a36ca971d2b3c2486beb889ba75e96 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/lib.rs
+++ b/polkadot/node/orchestra/proc-macro/src/lib.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use proc_macro2::{Ident, Span, TokenStream};
 use syn::{parse_quote, spanned::Spanned, Path};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs b/polkadot/node/orchestra/proc-macro/src/orchestra.rs
similarity index 70%
rename from polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs
rename to polkadot/node/orchestra/proc-macro/src/orchestra.rs
index 5f906eed694e4506e6c5c2faed8bcdab09197b11..ab1f9af3082fffbd4326111718d597e3e45b8e31 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/orchestra.rs
+++ b/polkadot/node/orchestra/proc-macro/src/orchestra.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use proc_macro2::TokenStream;
 use syn::{parse2, Result};
diff --git a/polkadot/node/orchestra/proc-macro/src/parse/mod.rs b/polkadot/node/orchestra/proc-macro/src/parse/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..05d6cc2efcd72424de8cbe997bfdea0528e70c19
--- /dev/null
+++ b/polkadot/node/orchestra/proc-macro/src/parse/mod.rs
@@ -0,0 +1,38 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod kw {
+	syn::custom_keyword!(event);
+	syn::custom_keyword!(signal);
+	syn::custom_keyword!(error);
+	syn::custom_keyword!(outgoing);
+	syn::custom_keyword!(gen);
+	syn::custom_keyword!(signal_capacity);
+	syn::custom_keyword!(message_capacity);
+	syn::custom_keyword!(subsystem);
+	syn::custom_keyword!(prefix);
+}
+
+mod parse_orchestra_attr;
+mod parse_orchestra_struct;
+
+mod parse_subsystem_attr;
+
+#[cfg(test)]
+mod tests;
+
+pub(crate) use self::{parse_orchestra_attr::*, parse_orchestra_struct::*};
+
+pub(crate) use self::parse_subsystem_attr::*;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
similarity index 89%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
index f5bba725af09d428895d40e11af6ac5371e1bc74..27486b5697a24c30a24d9683c7c0ebfc6bce9b69 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_attr.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use super::kw;
 use proc_macro2::Span;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
similarity index 95%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
index 9482429c5667a71d3de6c11dacb444e4ab5f94b0..38485e2cbcd83d951f8dbc262e2a4b99727d27b6 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_orchestra_struct.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use proc_macro2::{Span, TokenStream};
 use std::collections::{hash_map::RandomState, HashMap, HashSet};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs b/polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
similarity index 85%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
index e27031349e630b8df91940c741acbc2551da5d6a..6df4a4c8e292d5f11775dd433dd053504ce8dfea 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/parse_subsystem_attr.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use super::kw;
 use proc_macro2::Span;
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs b/polkadot/node/orchestra/proc-macro/src/parse/tests.rs
similarity index 89%
rename from polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs
rename to polkadot/node/orchestra/proc-macro/src/parse/tests.rs
index cff53727564ff11cec3e1eae00e21629cad84295..3bcfda45db8079bd3d7dd9e8b0b19d1c8074cc7c 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/tests.rs
+++ b/polkadot/node/orchestra/proc-macro/src/parse/tests.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use super::*;
 use crate::{SubSysAttrItem, SubSystemAttrItems};
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs b/polkadot/node/orchestra/proc-macro/src/subsystem.rs
similarity index 92%
rename from polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs
rename to polkadot/node/orchestra/proc-macro/src/subsystem.rs
index c12c742e0eb3b2f9fc40068f44c299a4ce087ee6..27f50704bb948c644fd3413579493f394510f7fe 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/subsystem.rs
+++ b/polkadot/node/orchestra/proc-macro/src/subsystem.rs
@@ -1,18 +1,17 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
 
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! Generates the bounds for a particular subsystem `Context` and associate `type Sender`.
 //!
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/tests.rs b/polkadot/node/orchestra/proc-macro/src/tests.rs
similarity index 73%
rename from polkadot/node/overseer/orchestra/proc-macro/src/tests.rs
rename to polkadot/node/orchestra/proc-macro/src/tests.rs
index 51bae46ca4de229d5d83755886deed2c754ade86..2b19b5f29a568bff2649f2222001c43b1eb12727 100644
--- a/polkadot/node/overseer/orchestra/proc-macro/src/tests.rs
+++ b/polkadot/node/orchestra/proc-macro/src/tests.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 use super::*;
 use assert_matches::assert_matches;
diff --git a/polkadot/node/overseer/orchestra/src/lib.rs b/polkadot/node/orchestra/src/lib.rs
similarity index 96%
rename from polkadot/node/overseer/orchestra/src/lib.rs
rename to polkadot/node/orchestra/src/lib.rs
index 8f872cf3a6688b6e8233d742db7e852df3e9f18a..3f84207de6b884de89cea3047baf8ba00daa0f71 100644
--- a/polkadot/node/overseer/orchestra/src/lib.rs
+++ b/polkadot/node/orchestra/src/lib.rs
@@ -1,18 +1,17 @@
-// Copyright 2021 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 //! # Orchestra
 //!
diff --git a/polkadot/node/orchestra/src/tests.rs b/polkadot/node/orchestra/src/tests.rs
new file mode 100644
index 0000000000000000000000000000000000000000..4b622faf889f7f3490df736ce2b27d78a5a21779
--- /dev/null
+++ b/polkadot/node/orchestra/src/tests.rs
@@ -0,0 +1,38 @@
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[test]
+#[rustversion::attr(not(stable), ignore)]
+fn ui_compile_fail() {
+	// Only run the ui tests when `RUN_UI_TESTS` is set.
+	if std::env::var("RUN_UI_TESTS").is_err() {
+		return
+	}
+
+	let t = trybuild::TestCases::new();
+	t.compile_fail("tests/ui/err-*.rs");
+}
+
+#[test]
+#[rustversion::attr(not(stable), ignore)]
+fn ui_pass() {
+	// Only run the ui tests when `RUN_UI_TESTS` is set.
+	if std::env::var("RUN_UI_TESTS").is_err() {
+		return
+	}
+
+	let t = trybuild::TestCases::new();
+	t.pass("tests/ui/ok-*.rs");
+}
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.rs b/polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.rs
rename to polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.stderr b/polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-01-duplicate-consumer.stderr
rename to polkadot/node/orchestra/tests/ui/err-01-duplicate-consumer.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-02-enum.rs b/polkadot/node/orchestra/tests/ui/err-02-enum.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-02-enum.rs
rename to polkadot/node/orchestra/tests/ui/err-02-enum.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-02-enum.stderr b/polkadot/node/orchestra/tests/ui/err-02-enum.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-02-enum.stderr
rename to polkadot/node/orchestra/tests/ui/err-02-enum.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.rs b/polkadot/node/orchestra/tests/ui/err-03-subsys-twice.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.rs
rename to polkadot/node/orchestra/tests/ui/err-03-subsys-twice.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.stderr b/polkadot/node/orchestra/tests/ui/err-03-subsys-twice.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-03-subsys-twice.stderr
rename to polkadot/node/orchestra/tests/ui/err-03-subsys-twice.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.rs b/polkadot/node/orchestra/tests/ui/err-04-missing-error.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.rs
rename to polkadot/node/orchestra/tests/ui/err-04-missing-error.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.stderr b/polkadot/node/orchestra/tests/ui/err-04-missing-error.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-04-missing-error.stderr
rename to polkadot/node/orchestra/tests/ui/err-04-missing-error.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.rs b/polkadot/node/orchestra/tests/ui/err-05-missing-field.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.rs
rename to polkadot/node/orchestra/tests/ui/err-05-missing-field.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.stderr b/polkadot/node/orchestra/tests/ui/err-05-missing-field.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-05-missing-field.stderr
rename to polkadot/node/orchestra/tests/ui/err-05-missing-field.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.rs b/polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.rs
rename to polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.stderr b/polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-06-missing-subsystem.stderr
rename to polkadot/node/orchestra/tests/ui/err-06-missing-subsystem.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.rs b/polkadot/node/orchestra/tests/ui/err-07-missing-spawner.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.rs
rename to polkadot/node/orchestra/tests/ui/err-07-missing-spawner.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.stderr b/polkadot/node/orchestra/tests/ui/err-07-missing-spawner.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-07-missing-spawner.stderr
rename to polkadot/node/orchestra/tests/ui/err-07-missing-spawner.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.rs b/polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.rs
rename to polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.stderr b/polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
rename to polkadot/node/orchestra/tests/ui/err-08-duplicate-subsystem.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.rs b/polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
rename to polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.rs
diff --git a/polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr b/polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
rename to polkadot/node/orchestra/tests/ui/err-09-uninit_generic_baggage.stderr
diff --git a/polkadot/node/overseer/orchestra/tests/ui/ok-01-wip.rs b/polkadot/node/orchestra/tests/ui/ok-01-wip.rs
similarity index 100%
rename from polkadot/node/overseer/orchestra/tests/ui/ok-01-wip.rs
rename to polkadot/node/orchestra/tests/ui/ok-01-wip.rs
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 23f92a7a2fa9cbed86c35fdb5adc9b8b6247f55c..2f49d013ad95103560b1d8a47fb87bfa59d66cef 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -15,7 +15,7 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
-orchestra = { path = "./orchestra" }
+orchestra = { path = "../orchestra" }
 gum = { package = "tracing-gum", path = "../gum" }
 lru = "0.7"
 parity-util-mem = { version = "0.11.0", default-features = false }
diff --git a/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs b/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs
deleted file mode 100644
index 3d6a6c7043ac1115477db64c7723bd9592a520ab..0000000000000000000000000000000000000000
--- a/polkadot/node/overseer/orchestra/proc-macro/src/parse/mod.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-mod kw {
-	syn::custom_keyword!(event);
-	syn::custom_keyword!(signal);
-	syn::custom_keyword!(error);
-	syn::custom_keyword!(outgoing);
-	syn::custom_keyword!(gen);
-	syn::custom_keyword!(signal_capacity);
-	syn::custom_keyword!(message_capacity);
-	syn::custom_keyword!(subsystem);
-	syn::custom_keyword!(prefix);
-}
-
-mod parse_orchestra_attr;
-mod parse_orchestra_struct;
-
-mod parse_subsystem_attr;
-
-#[cfg(test)]
-mod tests;
-
-pub(crate) use self::{parse_orchestra_attr::*, parse_orchestra_struct::*};
-
-pub(crate) use self::parse_subsystem_attr::*;
diff --git a/polkadot/node/overseer/orchestra/src/tests.rs b/polkadot/node/overseer/orchestra/src/tests.rs
deleted file mode 100644
index 09de7ed4d3d4a4f657fe88e73735acc6bca85680..0000000000000000000000000000000000000000
--- a/polkadot/node/overseer/orchestra/src/tests.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2022 Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-#[test]
-#[rustversion::attr(not(stable), ignore)]
-fn ui_compile_fail() {
-	// Only run the ui tests when `RUN_UI_TESTS` is set.
-	if std::env::var("RUN_UI_TESTS").is_err() {
-		return
-	}
-
-	let t = trybuild::TestCases::new();
-	t.compile_fail("tests/ui/err-*.rs");
-}
-
-#[test]
-#[rustversion::attr(not(stable), ignore)]
-fn ui_pass() {
-	// Only run the ui tests when `RUN_UI_TESTS` is set.
-	if std::env::var("RUN_UI_TESTS").is_err() {
-		return
-	}
-
-	let t = trybuild::TestCases::new();
-	t.pass("tests/ui/ok-*.rs");
-}
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 48639e58b274d6548c66c7cdff5484337249a472..5b455eb4484edd93cae6e253aa209ba0e028f669 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -13,7 +13,7 @@ polkadot-node-primitives = { path = "../primitives" }
 polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-statement-table = { path = "../../statement-table" }
 polkadot-node-jaeger = { path = "../jaeger" }
-orchestra = { path = "../overseer/orchestra" }
+orchestra = { path = "../orchestra" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 smallvec = "1.8.0"
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index 4aec7be170a51919888dcd63ac8930ef905316c9..b1ad45fd0ab899ff4bb94cf85d44d9264eb9d222 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -26,7 +26,7 @@ polkadot-node-network-protocol = { path = "../network/protocol" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-node-primitives = { path = "../primitives" }
 polkadot-overseer = { path = "../overseer" }
-metered = { package = "prioritized-metered-channel", path = "../metered-channel" }
+metered = { package = "prioritized-metered-channel", path = "../metered-channel" , "version" = "0.2.0" }
 
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }