Started working on the new folder structure