Move to files dir
Fix submodules