renamed packages, updated imports, modified extension points