Restructuring all features & moving to Migrate dev version