Some reorganization.
Started implementing measure conversion.
Reverted package refactoring.
Started preparing testing of metric conversion.