Changed the folder strcture