Updated support for Orientation in ST2. Cleanup the project