My Classes refactoring WORK IN PROGRESS
CLC-2498 MyClasses refactoring
CLC-2498 MyClasses refactoring