sorting out android classes into more appropriate packages
remaimed GAC to be a bit more descriptive