Refactoring of lib and classpath