restructure folder layout