new file system. some changes on code