Merge pull request #828 from xenolog/PR1

FIX: Quantum order. Package must be before files