Moved stuff to subdirectory. Generated an integration test.