Moved lots of stuff around, deleted Android app