Refactored glue-api and glue-client-android modules according to the new
data model, even if the code in those modules is nearly good to throw
away...