Product CRUD (code cleanup, fixed setup, added Category entiry)