Move some files and rename.

trying to fix dependencies.