Android Project refactored