Moved subdirectories to submodules
Updated references