Fixed gen script do to organization of files