updated container reference for declarations
moved level6 to l6 for conflict resolution
updated package name
updated main to handle changed folder/package name