Move layouts to app directory