Working Build Again

Fixed the Android stuff, cleaned up the project directory a bit,
hopefully unit tests coming soon.