Tidy up some code
Also output the test results while validating

Cleaned up some code as well. Use a separate output folder for
the neural networks.