Removed server code and moved android to root