refactoring ofclass libraries