Moved OS module back out. Renamed functions.