Rename files for sake of consistency, improve OS X setup script.