Split out android/server folder