Rearrange Code CRUD