Reorganizing files and code
Removing old files