Issue #7: restructure so we don't have conflicting makefiles