Finish initial refactor. Start deleting soon
Deleted old classes