Cleanup/reorder
Adding .DS_Store to gitignore