Update upstream with package structure