Start to refactory
Real start of Migration