chris-2-cleanup_and_rotation

Added rotation support. Refactored to android naming conventions and other code cleanup.