Include the binaries
Change the primary command and clean up a little