Re: retaining folder structure

Or is this where I start working with collections and forget about folders altogether?

I would say, use keywords (and other metadata) and forget about folders altogether.

Keywords and other metadata will give you capability to organize that you simply cannot attain using folders.

With regards to your existing problem, I do not know any easy way to move the photos back to their previous folders, other than manually. There is no automatic way to do this.