Metrics glued into main files; README updated