Saved rotation state
Renamed variables for consistency
Re-arranged project files