Types deleted, package added to makefile