Restructure android app and js server directories