Updated project name and package declarations. Tidied up calendar class
and fixed time issue.