Remove layouts so we can create a submodule (hopefully)
Revert "Remove layouts so we can create a submodule (hopefully)"

This reverts commit 9432a4e357ac19976b42ea2175e8bbbab5d82ce1.
Attempt at layout again