formatted and refactored
Merged Occasion with Project package
Merged occasion with project
Viewing parameter and occasions fixed