Add source directories into classpath (for import directive to work)
Cleanup task code (prefer groovy syntax)