Updated Makefile to account for new moduels