Move layouts to folder for all modules
Merge branch 'penelopa'