server reorganice package structure