Update package structure