change folder structure for more dependent. This is just the server