refactor file and directory structure. group osx stuff together for bash