Add Makefile and update package paths to be more idiomatic