makefile and structure cleanup.