Move some file around; removed some obsolete code.