Cleaned up a bit to introduce the real shebang (runnable class)
Renamed files to non-test names, renamed classes to match.