Changed structure to facilitate git submodule usage