namespace refactoring to compile Android app