Moving classes/packages around, adding some scaladoc
Adding some scaladoc