Create new folder structure (clean the mess)