Code refactoring: HypsOrder was extracted to its own source file
Minor changes