restructured file hierarchy