Changed package names, removed package androidApp, Changed so logic is
in controller, data in dataStorage and server in server.