Further refactoring of Android, webserver and sensor code