Move classes back to main repository
Fix ui for android 2.3