Change up order & cmake changes to Sys.