Move and clean up

Moved one file and deleted two others.