refactored app to remove git submodule dependencies