Name changes

Moved some file names around.