Organized out world blocks with mech blocks.

This will be helpful in the future