Modularize Volume. Add Mac OS X compatibility