Refactored to eliminate 'lib' subdir