project restructured for submodules support