Improved Code and repackaged classes