refactoring - add metrics as modules