Converted to a maven module