Moved layouts into a separate directory