restructure folder layout because I screwed up first time...