Removed unnecessary Classes
Removed unneed class
Fixing some imports
WOO a build.xml