Refactoring. Metrics and Evaluations in custom folders. Two metrics implemented. Fixes updated.