restructure folder structure