Refactor and better organization of the coverage plan module