Refactored Occupation and ResourceFactory classes to use proper naming convention...