Move layout-class into components folder