Clean up, refractor, movement of class, and del of unused classes