Reorganised dependencies. Will move to maven in future