Cleaned and refactored

Cleaning, renaming, restructuring, deleted old unused classes.