Class Loading Refactor

Refactored class loading