included data in directory, reorganized directories