Restructured files into directories