Put utilities in utils.c
Wrap up headers
pull fillstick into new architecture
fix Makefile