Migrate calendar to controller folder