Just some cleaning up effort and moving about

This is exclusively just moving files. There are no deletions.