Reordered structure

Changed structure to fit our server one.