Added modulerouter for logic and view seperation