Split into packages and updated file references to use collection paths.