Restructuring and implemented test server.