Refractor and create new packages under mvc