Add lib/ and server/