Godclassrefactoring pull request to merge with develop

godclassrefactoring  refactoring is completed therefore it needed to be merged in develop branch