Reorganized folder so they match thae namespace names