classpath corrections
Code cleaning, mostly import organisation.