Calendar Project
Restructuring
and Additional Changes