new folder structure (by function, not type)