Replaced better-defaults with git submodule