Rename System to Core so it matchs the namespace (why wasn't this done before..?)