Re-arrange class methods, create Constants

The class<<self style is just that, a style.