Test package renamed as well
Broke json file source into its own file
Hacked out some half-baked block behavior delegation code