Reorganized things a bit
Implemented an aggregatefile consumer (for CLI analysis)