Making this repo appropriate for submodule use