Reorganized, cleaned up directory.