Yes this probably makes sense.  It would match the new folder structure too.