Conversion to version 3

Time to clear out the old (version 2.5) and start building the new
(version 3.0)