Fixed the file setup to work better with future CI Systems