restructuring into folders