Fix missing variables after restructuring
Update dev dependency packages to latest
Update commander to v2.3.0
Update wrench to v1.5.8