Change folder structure to allow it can be clone as git submodule