added magit, renamed files