Reorganized and cleaned up FsBroker code