submodule cleanup and organization, this commit might get rolledback