Separated files, fixed references, and got stats per app.