Fixed up file system

Fixed up file system in order to address the technology spike