Attempting to restructure package, but putting testing back and trying to fix vagrant scripts