Move directories into top level