Implemented the new folder structure