Break up smoking spike file in documented classes per file

Also initially adjust metrics