Reorganizing repo
Cleaning up