Replaced an exception handler, using a package with a wider compatibility.
Merge pull request #1 from m73/package_replacement

Replaced sun package with java.lang for better compatibility
Move some classes into packages