Ordrered and refactored some drupal path functions