Moves preparing for reorganization

Various changes and file moves in preparation for reorganizing my
repositories.