changed package names, converted a few files to scala