Whenever I import photos (from the camera) it creates a new event. You may try importing your folders one (or a group) at a time. That would of course require re-importing everything. Another thing to check out is, at the bottom of the Events menu there's an option to "Autosplit selected events". Then you can re-merge them based on your own criteria. (Merging is easy - drag & drop).