Update package structure + add auto generated tests