restructure generic folder