Move contrib modules to contrib directory.
Shorten $variables to $vars in template.php