Added basics, types, deleted date from filename.