Moved all code into a package so a javadoc can be generated