Refactoring (file names, lib dir)