Added makefiles back, getting ready to rework the CLI