Tidying
Moved constants into correct package
Some fractional constants