Reorganizations

Files have been moved, types have been renamed.