Cleanup noneclature files in make clean.
Add a bit more nomeclature.
Change nomeclature layout