Removing old files and added new file structure