refactoring and organizing libraries;