Install new can housing in bedroom and closet , move switches and outlets in closet Install whole home surge protection under both panels with dedicated breaker