Update package structure, again