Converted to maven. Optimised a bit.