Adding coverage, moving files