changing architecture to make a working android client
configuration changes working on desktop client