Moved metric classes to subfolder.