Move all types into the os package
More nesting