renamed to folder to unix style
added __MACOSX to git ignore