File Rearrangement

Changed around the file system for blocks