Feature/restructure layout