Something which may be cool for modularization is to break the code into definitions and implementations as well.

Perhaps even remove android dependencies from the interfaces so we could in theory make a pure java library.
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira