Moved to maven (part 2)