Updated internal package references to use the proper import path