Refactor class loading