added missing files and changed public elements to private