moving CategoryController and a few fixes