Refactor indicators into separate classes

Also increases timeout to the scala REST API so we can test with larger files.