Moved into separate directory for easier testing later.