Renamed top-level directories to avoid confusion