refactoring the creator and organization classes