restructred in order to match the live server structure