Tidying up simple cov behavior
Updating coverage mechanism
Re-arrangement of classes