Refactoring features & updating migration classes
Cleanup