converted to proper Android project