changed file structure around for new setup
Removing old files