Moved Category controller logic to its own controller, see issue #6