Simplified lib/ subdirs and paths