More clean up, moved directory.