Changing the way Categories and Plans are organized