Removed some o files and updated buddy to put block meta data within block itself.