Feat/server structure