migrated to drupal v7, added 2-level structure support