reorganize by putting generation in separate dir