restructured the filesystem