Refactoring

Cleaning out old project