Changing dev to contain the whole structure, minus data

Discussion and suggestions can go here.