Cleaned up method names

Simplified many names making the code easier to read and more concise.
Renamed the model package to the "tag" package
Moved some classes in the android app to subpackages