Move grandpa crates to consensus folder (#13458)

* Move grandpa under consensus dir
* Rename grandpa folder
* Finish grandpa renaming
* Minor tweaks
* Cargo fmt
* Adjust path to chain spec

substrate/Cargo.toml

@@ -29,6 +29,8 @@ members = [
 	"client/consensus/babe/rpc",
 	"client/consensus/common",
 	"client/consensus/epochs",
+	"client/consensus/grandpa",
+	"client/consensus/grandpa/rpc",
 	"client/consensus/manual-seal",
 	"client/consensus/pow",
 	"client/consensus/slots",
@@ -38,8 +40,6 @@ members = [
 	"client/executor/runtime-test",
 	"client/executor/wasmi",
 	"client/executor/wasmtime",
-	"client/finality-grandpa",
-	"client/finality-grandpa/rpc",
 	"client/informant",
 	"client/keystore",
 	"client/merkle-mountain-range",
@@ -184,6 +184,7 @@ members = [
 	"primitives/consensus/aura",
 	"primitives/consensus/babe",
 	"primitives/consensus/common",
+	"primitives/consensus/grandpa",
 	"primitives/consensus/pow",
 	"primitives/consensus/slots",
 	"primitives/consensus/vrf",
@@ -193,7 +194,6 @@ members = [
 	"primitives/database",
 	"primitives/debug-derive",
 	"primitives/externalities",
-	"primitives/finality-grandpa",
 	"primitives/inherents",
 	"primitives/io",
 	"primitives/keyring",