Reorganize test files/server