Structure updates

Decision: Keep categories only 1 level deep, as Toolbox may change in
the future. This is more flexible.