Dev/jpsnyder/cleanup

Makefile and directory structure cleanup.