Add categories
Change structure to more man-like