Fixed extracting and added where drupal should finally rest.