cleaning up file structure a bit, starting to imagine the Layout