Refactored, moved classes around and deleted old code