Added back the submodule, reaffixed the app and such