Reorganization for commuterbuddy