Attempting to restructure package, but putting testing back