First get keystone jacks or other jacks and a patch panel. After that get a better switch. A switch with enough ports for the most important rooms. Then get short patch cables and patch the important rooms. And voila you have cleaned it up perfectly