Moved src up a level to expose readme, apk

And fixed a bug.