Change how system.rs imports blocks to avoid merge conflicts

Change how system.rs imports blocks to avoid merge conflicts #61