Changed the folder structure to make it more generic
Removed the old files