Refactoring class loader to support readability and react to code
signature changes.