Change structure to meet new Makefile requirements