Moving things into correct structure