More additions and deletions to basic gen setup files and dirs.