Planning a 1031 -- need a good broker

[David Smith]

I plan to sell a 4 family in Hudson county, and 1031 to another investment multifamily/commercial mix use in Bergen/Hudson County or around.  And the property to buy will depend on how much I can sell the 4 family.  Surely the sale price will be higher than that i paid for. 

1)  Any broker you can recommend for such a deal?  Someone who knows the 1031 timing, legal and tax and financing concerns, and finding a deal to buy.  I had RE license before.  Shall i find a commercial broker instead of residential broker?

2) The 4 family is not in LLC name. Shall i change it to LLC before I sell, so as to better facilitate the 1031 and for the buying deal?

Thanks.