Refactoring Osx module.