Fixed Collision and position bugs.
Deleted unnecessary classes
Added new classes