Organizing custom units...help please?

Ok, now that ive been reminded how to transfer unit files I'd like to clean up the custom units I've created...get them all into ONE set of folders, instead of having to dig into human, neutral hostile, etc for what I want. I know about the 'owning race' thing, but if i change them all to like 'Demon' then some don't move, etc..I also know about the 'campaign' and 'special' flags, but I'm obviously missing something.