Update namespaces.
Update Calendar interface.
Update Calendar Factory interface.
Minor restructure to Calendar class.
Change the way the factories work.