Moving some files. Organization seems to make more sense this way.