Add git hooks, consolidate submodules, etc