Revert "Move to layout folder"

This reverts commit 7d2a6c73ad1feb9dab7d24e66b44dc2f5e883a3a.