Fix STid STR files arrangement