refactor lib dir
Merge pull request #98 from Trott/refactor-lib

refactor lib dir