Category updates

This rearranges and renames some categories and gets rid of 'other' category for unwanted bricks.