Move layouts to separate directory