WP-1009: Made the 2-level structure to 1-level Android project

Also integrated PR #14, #16.

Jira issue WP-1009
http://jira.webinos.org/browse/WP-1009