Reorganized server file structure