Combining 2 email accounts (POP and Exchange) into one Outlook inbox

Hello,

I'm running Windows Vista with Outlook 2007.

I have a personal email account and a work account. Both were POP accounts until recently and both were coming into a single inbox.

I bought a new laptop and at the same time my work email account was changed to an Exchange account.

I now have two lots of mail folders, one for Exchange and one for my personal accounts - which I find much less manageable.

Is there a way of merging them into a single set? (I also now have my data files saved in two different locations on my latop - could that be a factor?)

Thanks!