Restructure server