Made changes to the directory structure, added a common model to the router so that both the view and edit modes can have access to them