initial folder mods for android
various changes based on first android compilation