tweaked generation, added "folder" organization