switchbox+router

My work is *hopefully* going to be moving to a new building soon. I haven't been told yet, but I imagine I'm going to have to run all the data lines. I need to hook up 15 computers have wireless available. Whoever set things up before me daisy chained a bunch of wireless routers and 4 and 8 port switch boxes together. Best I can tell it's an 8 port box going to two routers and two 4 port boxes, and one of the 4 port boxes going to another 4 port box. This makes networking an absolute nightmare. What's the best way to get all the hard wired computers + the wireless things like phones, laptops, and ipads on the same network group to easily share printers and such? I'm thinking some combination of a 24 port switch box to leave room to grow, and a good router. I have a new router I set up a while back, that I'd like to keep if possible as it has some very nice features, but if it'd make things easier I'll replace it.