Fixed Shell to fit Filemap, and refactored Filefmap