Updated structure for using as git submodule