simplified/fixed json conversions, refactored module/package node classes