Moved everything into an Android directory to prepare for server