Renamed and moved various files and removed non needed