- Reorganized attachments
- Reorganized imports to Core and CalendarMonth