Restructured calender to fit MVC design pattern

Still bugged