Changing the structure to match dev scheme