reorganize current customer service and testing it