Move directories into proper structure