Fix names, folderize graphics