git repo reorganization, there's still a lot of old files that need to
be deleted