[misc] Moved class in the right directory
[cleanup] Removed unused dependencies
[cleanup] Deleted unused code, replaced proprietary exception with a standard java.lang one