Cleanup, add FirService and rename activities to FitXXX