Refactored to stick to maven structure. Tests are now found.