Clean Up

I removed unused nodes and organized nodes by parent node (for example,
all essentials.blah are grouped together)