reorganize services into type folders