Refactored project metadata into ProjectMetadata class
Merged from master