restructure layout and files