reworked structure using express