[Server] revised folder structure