Rotation and Scale support
Cleaning up TestScreen
Reorganizing everything