Move session middleware to same directory as other middleware
Fix circular require