Added (cleaned) lib/ folder