Reorganized File and added missing CreateNewFile function