restructured several files