Restructured + Added server