#05310001: Clean up. And moving various stuff to other directories.