Consolidate libraries into lib/ directory