changed file structure and added server