Updated files to make more sense