Added os files.
Merged conflicts.