restructured file structure