There should be no problem copying your folder setup onto your Kindle 2, just put them all under the documents folder. However, the Kindle then flattens (i.e. ignores) the folder structure.
To get back collections in place of folders, I suggest using Calibre's
Kindle Collections plugin. You can use this to edit collections on your Kindle with a GUI without needing to use Calibre to store or manage your books.