moving to top level (removing servo subdir)