Modularise package into generic makefile