Moved files around, trying to solve testing.