restructured files... again