Trim unneeded whitespace.
Add lib/, which is generated from src/
Sort.
Get rid of deprecated syntax.