Move os* to os/
Merge branch 'master' of https://github.com/juruen/cavalieri