@Eddie: really sorry that you have to work this way because of this limitation! Folders and documents are a big plus for the organization, in my opinion at least.
In the future, ideally we would love to have all internal links auto-update when you use our built-in way to move things around (see Move items to another place). That would make things a lot easier.