Update package structure and README