add FileSystem, modify directory structure