Revert "Fixed migration"

This reverts commit 5801ea1819b0e4924dc23336e61cf6153b930850.
Revert "Changed device types to platforms and form factors"

This reverts commit ccc15aa2ccd579303ae46bd23fc5c11bc08ff07f.
Migration patch up.