Remove submodules because they're moved
Re-organize files