move sub-layouts into source/layouts, where it should go