Refactoring to 1.6.0, standard format, simplifying

(still need to write integ tests).