OS class is now os namespace
Merge