Refactor commit (Android Source)

Changed the base architecture of the program by creating new packages
and refactoring the classes.