Merged quantity and olivecraft packages

There isn't any point to keep them separated anymore.