Reorganize .spp structure