Updated Magit, moved and organized directories