Merge pull request #1 from raginruffalo/master

Updated src files and removed old dependencies
Fixed Problems
Merge pull request #2 from momnop/master

Fixed code errors in .java file names