Reorganized all controller code and separated by CRUD