Moved out of block subdirectory, updated block name in files