Move and basic refactor complete