Refactoring entire project
Adding Android Project