Changed main module structure for packaging into apk.