Minor cleanup
Move lib/blocks, lib/terrain back to demo