refactored to use same Java base package as native app