Moved files to where they should have been. Added utest back in.