moved java classes into a package, changed naming convention of a few things