Reorganizing inital code
Cleaning old files