Reorganize routes, add categories and add WebBlocks