Reformatted the way Blocks are stored and registered