refactored market and conversations into new files