Changed server file structure