Renames and changes. Planning big things.
worked on decoupling MD