Refactor config. Re-organize lib with git-submodules