Shifted away from the with enclosure construct for adding nodes
Merged package inits
Merge into init