Moved component layouts in separated files