Merge pull request #2255 from ctweney/clc-3447

CLC-3447 Reformat stats api as numbers to make it easier to use in other tools
CLC-3410 Move everything from app/services to lib/services to make things run smoother in development mode