Reorganize categories

Signed-off-by: Alexsander Akers <a2@pandamonia.us>