Move around files, reorganize
More reorganizing
Add submodule