diff --git a/CHANGELOG.txt b/CHANGELOG.txt
deleted file mode 100644
index f0c0aab..0000000
--- a/CHANGELOG.txt
+++ /dev/null
@@ -1,1138 +0,0 @@
-
-Drupal 6.38, 2016-02-24 - Final release
----------------------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2016-001.
-- Previously unreleased documentation fixes.
-
-Drupal 6.37, 2015-08-19
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2015-003.
-
-Drupal 6.36, 2015-06-17
------------------------
-- Fixed security issues (OpenID impersonation). See SA-CORE-2015-002.
-
-Drupal 6.35, 2015-03-18
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2015-001.
-
-Drupal 6.34, 2014-11-19
------------------------
-- Fixed security issues (session hijacking). See SA-CORE-2014-006.
-
-Drupal 6.33, 2014-08-06
------------------------
-- Fixed security issues (denial of service). See SA-CORE-2014-004.
-
-Drupal 6.32, 2014-07-16
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2014-003.
-
-Drupal 6.31, 2014-04-16
------------------------
-- Fixed security issues (information disclosure). See SA-CORE-2014-002.
-
-Drupal 6.30, 2014-01-15
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2014-001.
-
-Drupal 6.29, 2013-11-20
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2013-003.
-
-Drupal 6.28, 2013-01-16
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2013-001.
-
-Drupal 6.27, 2012-12-19
------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2012-004.
-
-Drupal 6.26, 2012-05-02
------------------------
-- Fixed a small number of bugs.
-- Made code documentation improvements.
-
-Drupal 6.25, 2012-02-29
------------------------
-- Fixed regressions introduced in Drupal 6.24 only.
-
-Drupal 6.24, 2012-02-01
------------------------
-- Improved performance of search indexing and user operations by adding indexes.
-- Fixed issues with themes getting disabled due to missing locking in
-  system_theme_data().
-- Fix issue with blocks being disabled on updates in _block_rehash().
-- Further improvements to PHP 5.3, PHP 4 and PostgreSQL compatibility.
-- Improved code documentation at various places.
-- Fixed a variety of other bugs.
-
-Drupal 6.23, 2012-02-01
------------------------
-- Fixed security issues (Cross site scripting). See SA-CORE-2012-001.
-
-Drupal 6.22, 2011-05-25
------------------------
-- Made Drupal 6 work better with IIS and Internet Explorer.
-- Fixed .po file imports to work better with custom textgroups.
-- Improved code documentation at various places.
-- Fixed a variety of other bugs.
-
-Drupal 6.21, 2011-05-25
------------------------
-- Fixed security issues (Cross site scripting). See SA-CORE-2011-001.
-
-Drupal 6.20, 2010-12-15
------------------------
-- Fixed a variety of small bugs, improved code documentation.
-
-Drupal 6.19, 2010-08-11
------------------------
-- Fixed a variety of small bugs, improved code documentation.
-
-Drupal 6.18, 2010-08-11
------------------------
-- Fixed security issues (OpenID authentication bypass, File download access
-  bypass, Comment unpublishing bypass, Actions cross site scripting),
-  see SA-CORE-2010-002.
-
-Drupal 6.17, 2010-06-02
------------------------
-- Improved PostgreSQL compatibility
-- Better PHP 5.3 and PHP 4 compatibility
-- Better browser compatibility of CSS and JS aggregation
-- Improved logging for login failures
-- Fixed an incompatibility with some contributed modules and the locking system
-- Fixed a variety of other bugs.
-
-Drupal 6.16, 2010-03-03
------------------------
-- Fixed security issues (Installation cross site scripting, Open redirection,
-  Locale module cross site scripting, Blocked user session regeneration),
-  see SA-CORE-2010-001.
-- Better support for updated jQuery versions.
-- Reduced resource usage of update.module.
-- Fixed several issues relating to support of install profiles and
-  distributions.
-- Added a locking framework to avoid data corruption on long operations.
-- Fixed a variety of other bugs.
-
-Drupal 6.15, 2009-12-16
------------------------
-- Fixed security issues (Cross site scripting). See SA-CORE-2009-009.
-- Fixed a variety of other bugs.
-
-Drupal 6.14, 2009-09-16
------------------------
-- Fixed security issues (OpenID association cross site request forgeries,
-  OpenID impersonation and File upload). See SA-CORE-2009-008.
-- Changed the system modules page to not run all cache rebuilds; use the
-  button on the performance settings page to achieve the same effect.
-- Added support for PHP 5.3.0 out of the box.
-- Fixed a variety of small bugs.
-
-Drupal 6.13, 2009-07-01
------------------------
-- Fixed security issues (Cross site scripting, Input format access bypass and
-  Password leakage in URL). See SA-CORE-2009-007.
-- Fixed a variety of small bugs.
-
-Drupal 6.12, 2009-05-13
------------------------
-- Fixed security issues (Cross site scripting). See SA-CORE-2009-006.
-- Fixed a variety of small bugs.
-
-Drupal 6.11, 2009-04-29
------------------------
-- Fixed security issues (Cross site scripting and limited information
-  disclosure). See SA-CORE-2009-005.
-- Fixed performance issues with the menu router cache, the update
-  status cache and improved cache invalidation
-- Fixed a variety of small bugs.
-
-Drupal 6.10, 2009-02-25
------------------------
-- Fixed a security issue, (Local file inclusion on Windows),
-  see SA-CORE-2009-003.
-- Fixed node_feed() so custom fields can show up in RSS feeds.
-- Improved PostgreSQL compatibility.
-- Fixed a variety of small bugs.
-
-Drupal 6.9, 2009-01-14
-----------------------
-- Fixed security issues, (Access Bypass, Validation Bypass and Hardening
-  against SQL injection). See SA-CORE-2009-001.
-- Made HTTP request checking more robust and informative.
-- Fixed HTTP_HOST checking to work again with HTTP 1.0 clients and
-  basic shell scripts.
-- Removed t() calls from all schema documentation. Suggested best practice
-  changed for contributed modules, see http://drupal.org/node/322731.
-- Fixed a variety of small bugs.
-
-Drupal 6.8, 2008-12-11
-----------------------
-- Removed a previous change incompatible with PHP 5.1.x and lower.
-
-Drupal 6.7, 2008-12-10
------------------------
-- Fixed security issues, (Cross site request forgery and Cross site
-  scripting), see SA-2008-073.
-- Updated robots.txt and .htaccess to match current file use.
-- Fixed a variety of small bugs.
-
-Drupal 6.6, 2008-10-22
-----------------------
-- Fixed security issues, (File inclusion, Cross site scripting), See
-  SA-2008-067.
-- Fixed a variety of small bugs.
-
-Drupal 6.5, 2008-10-08
-----------------------
-- Fixed security issues, (File upload access bypass, Access rules bypass,
-  BlogAPI access bypass), see SA-2008-060.
-- Fixed a variety of small bugs.
-
-Drupal 6.4, 2008-08-13
-----------------------
-- Fixed a security issue (Cross site scripting, Arbitrary file uploads via
-  BlogAPI, Cross site request forgeries and Various Upload module
-  vulnerabilities), see SA-2008-047.
-- Improved error messages during installation.
-- Fixed a bug that prevented AHAH handlers to be attached to radios widgets.
-- Fixed a variety of small bugs.
-
-Drupal 6.3, 2008-07-09
-----------------------
-- Fixed security issues, (Cross site scripting, cross site request forgery,
-  session fixation and SQL injection), see SA-2008-044.
-- Slightly modified installation process to prevent file ownership issues on
-  shared hosts.
-- Improved PostgreSQL compatibility (rewritten queries; custom blocks).
-- Upgraded to jQuery 1.2.6.
-- Performance improvements to search, menu handling and form API caches.
-- Fixed Views compatibility issues (Views for Drupal 6 requires Drupal 6.3+).
-- Fixed a variety of small bugs.
-
-Drupal 6.2, 2008-04-09
-----------------------
-- Fixed a variety of small bugs.
-- Fixed a security issue (Access bypasses), see SA-2008-026.
-
-Drupal 6.1, 2008-02-27
-----------------------
-- Fixed a variety of small bugs.
-- Fixed a security issue (Cross site scripting), see SA-2008-018.
-
-Drupal 6.0, 2008-02-13
-----------------------
-- New, faster and better menu system.
-- New watchdog as a hook functionality.
-   * New hook_watchdog that can be implemented by any module to route log
-     messages to various destinations.
-   * Expands the severity levels from 3 (Error, Warning, Notice) to the 8
-     levels defined in RFC 3164.
-   * The watchdog module is now called dblog, and is optional, but enabled by
-     default in the default install profile.
-   * Extended the database log module so log messages can be filtered.
-   * Added syslog module: useful for monitoring large Drupal installations.
-- Added optional e-mail notifications when users are approved, blocked, or
-  deleted.
-- Drupal works with error reporting set to E_ALL.
-- Added scripts/drupal.sh to execute Drupal code from the command line. Useful
-  to use Drupal as a framework to build command-line tools.
-- Made signature support optional and made it possible to theme signatures.
-- Made it possible to filter the URL aliases on the URL alias administration
-  screen.
-- Language system improvements:
-    * Support for right to left languages.
-    * Language detection based on parts of the URL.
-    * Browser based language detection.
-    * Made it possible to specify a node's language.
-    * Support for translating posts on the site to different languages.
-    * Language dependent path aliases.
-    * Automatically import translations when adding a new language.
-    * JavaScript interface translation.
-    * Automatically import a module's translation upon enabling that module.
-- Moved "PHP input filter" to a standalone module so it can be deleted for
-  security reasons.
-- Usability:
-    * Improved handling of teasers in posts.
-    * Added sticky table headers.
-    * Check for clean URL support automatically with JavaScript.
-    * Removed default/settings.php. Instead the installer will create it from
-      default.settings.php.
-    * Made it possible to configure your own date formats.
-    * Remember anonymous comment posters.
-    * Only allow modules and themes to be enabled that have explicitly been
-      ported to the correct core API version.
-    * Can now specify the minimum PHP version required for a module within the
-      .info file.
-    * Drupal core no longer requires CREATE TEMPORARY TABLES or LOCK TABLES
-      database rights.
-    * Dynamically check password strength and confirmation.
-    * Refactored poll administration.
-    * Implemented drag-and-drop positioning for blocks, menu items, taxonomy
-      vocabularies and terms, forums, profile fields, and input format filters.
-- Theme system:
-    * Added .info files to themes and made it easier to specify regions and
-      features.
-    * Added theme registry: modules can directly provide .tpl.php files for
-      their themes without having to create theme_ functions.
-    * Used the Garland theme for the installation and maintenance pages.
-    * Added theme preprocess functions for themes that are templates.
-    * Added support for themeable functions in JavaScript.
-- Refactored update.php to a generic batch API to be able to run time-consuming
-  operations in multiple subsequent HTTP requests.
-- Installer:
-    * Themed the installer with the Garland theme.
-    * Added form to provide initial site information during installation.
-    * Added ability to provide extra installation steps programmatically.
-    * Made it possible to import interface translations at install time.
-- Added the HTML corrector filter:
-    * Fixes faulty and chopped off HTML in postings.
-    * Tags are now automatically closed at the end of the teaser.
-- Performance:
-    * Made it easier to conditionally load .include files and split up many core
-      modules.
-    * Added a JavaScript aggregator.
-    * Added block-level caching, improving performance for both authenticated
-      and anonymous users.
-    * Made Drupal work correctly when running behind a reverse proxy like
-      Squid or Pound.
-- File handling improvements:
-    * Entries in the files table are now keyed to a user instead of a node.
-    * Added reusable validation functions to check for uploaded file sizes,
-      extensions, and image resolution.
-    * Added ability to create and remove temporary files during a cron job.
-- Forum improvements:
-    * Any node type may now be posted in a forum.
-- Taxonomy improvements:
-    * Descriptions for terms are now shown on taxonomy/term pages as well
-      as RSS feeds.
-    * Added versioning support to categories by associating them with node
-      revisions.
-- Added support for OpenID.
-- Added support for triggering configurable actions.
-- Added the Update status module to automatically check for available updates
-  and warn sites if they are missing security updates or newer versions.
-  Sites deploying from CVS should use http://drupal.org/project/cvs_deploy.
-  Advanced settings provided by http://drupal.org/project/update_advanced.
-- Upgraded the core JavaScript library to jQuery version 1.2.3.
-- Added a new Schema API, which provides built-in support for core and
-  contributed modules to work with databases other than MySQL.
-- Removed drupal.module. The functionality lives on as the Site network
-  contributed module (http://drupal.org/project/site_network).
-- Removed old system updates. Updates from Drupal versions prior to 5.x will
-  require upgrading to 5.x before upgrading to 6.x.
-
-Drupal 5.23, 2010-08-11
------------------------
-- Fixed security issues (File download access bypass, Comment unpublishing
-  bypass). See SA-CORE-2010-002.
-
-Drupal 5.22, 2010-03-03
------------------------
-- Fixed security issues (Open redirection, Locale module cross site scripting,
-  Blocked user session regeneration). See SA-CORE-2010-001.
-
-Drupal 5.21, 2009-12-16
------------------------
-- Fixed a security issue (Cross site scripting). See SA-CORE-2009-009.
-- Fixed a variety of small bugs.
-
-Drupal 5.20, 2009-09-16
------------------------
-- Avoid security problems resulting from writing Drupal 6-style menu declarations.
-- Fixed security issues (session fixation). See SA-CORE-2009-008.
-- Fixed a variety of small bugs.
-
-Drupal 5.19, 2009-07-01
------------------------
-- Fixed security issues (Cross site scripting and Password leakage in URL).
-  See SA-CORE-2009-007.
-- Fixed a variety of small bugs.
-
-Drupal 5.18, 2009-05-13
-----------------------
-- Fixed security issues (Cross site scripting). See SA-CORE-2009-006.
-- Fixed a variety of small bugs.
-
-Drupal 5.17, 2009-04-29
------------------------
-- Fixed security issues (Cross site scripting and limited information disclosure) see SA-CORE-2009-005.
-- Fixed a variety of small bugs.
-
-Drupal 5.16, 2009-02-25
------------------------
-- Fixed a security issue, (Local file inclusion on Windows). See
-  SA-CORE-2009-004.
-- Fixed a variety of small bugs.
-
-Drupal 5.15, 2009-01-14
-----------------------
-- Fixed security issues, (Hardening against SQL injection). See
-  SA-CORE-2009-001.
-- Fixed HTTP_HOST checking to work again with HTTP 1.0 clients and
-  basic shell scripts.
-- Fixed a variety of small bugs.
-
-Drupal 5.14, 2008-12-11
-----------------------
-- Removed a previous change incompatible with PHP 5.1.x and lower.
-
-Drupal 5.13, 2008-12-10
------------------------
-- fixed a variety of small bugs.
-- fixed security issues, (Cross site request forgery and Cross site scripting), see SA-2008-073
-- updated robots.txt and .htaccess to match current file use.
-
-Drupal 5.12, 2008-10-22
------------------------
-- fixed security issues, (File inclusion), see SA-2008-067.
-
-Drupal 5.11, 2008-10-08
------------------------
-- fixed a variety of small bugs.
-- fixed security issues, (File upload access bypass, Access rules bypass,
-  BlogAPI access bypass, Node validation bypass), see SA-2008-060
-
-Drupal 5.10, 2008-08-13
------------------------
-- fixed a variety of small bugs.
-- fixed security issues, (Cross site scripting, Arbitrary file uploads via
-  BlogAPI and Cross site request forgery), see SA-2008-047
-
-Drupal 5.9, 2008-07-23
-----------------------
-- fixed a variety of small bugs.
-- fixed security issues, (Session fixation), see SA-2008-046
-
-Drupal 5.8, 2008-07-09
-----------------------
-- fixed a variety of small bugs.
-- fixed security issues, (Cross site scripting, cross site request forgery, and
-  session fixation), see SA-2008-044
-
-Drupal 5.7, 2008-01-28
-----------------------
-- fixed the input format configuration page.
-- fixed a variety of small bugs.
-
-Drupal 5.6, 2008-01-10
-----------------------
-- fixed a variety of small bugs.
-- fixed a security issue (Cross site request forgery), see SA-2008-005
-- fixed a security issue (Cross site scripting, UTF8), see SA-2008-006
-- fixed a security issue (Cross site scripting, register_globals), see SA-2008-007
-
-Drupal 5.5, 2007-12-06
-----------------------
-- fixed missing missing brackets in a query in the user module.
-- fixed taxonomy feed bug introduced by SA-2007-031
-
-Drupal 5.4, 2007-12-05
-----------------------
-- fixed a variety of small bugs.
-- fixed a security issue (SQL injection), see SA-2007-031
-
-Drupal 5.3, 2007-10-17
-----------------------
-- fixed a variety of small bugs.
-- fixed a security issue (HTTP response splitting), see SA-2007-024
-- fixed a security issue (Arbitrary code execution via installer), see SA-2007-025
-- fixed a security issue (Cross site scripting via uploads), see SA-2007-026
-- fixed a security issue (User deletion cross site request forgery), see SA-2007-029
-- fixed a security issue (API handling of unpublished comment), see SA-2007-030
-
-Drupal 5.2, 2007-07-26
-----------------------
-- changed hook_link() $teaser argument to match documentation.
-- fixed a variety of small bugs.
-- fixed a security issue (cross-site request forgery), see SA-2007-017
-- fixed a security issue (cross-site scripting), see SA-2007-018
-
-Drupal 5.1, 2007-01-29
-----------------------
-- fixed security issue (code execution), see SA-2007-005
-- fixed a variety of small bugs.
-
-Drupal 5.0, 2007-01-15
-----------------------
-- Completely retooled the administration page
-    * /Admin now contains an administration page which may be themed
-    * Reorganised administration menu items by task and by module
-    * Added a status report page with detailed PHP/MySQL/Drupal information
-- Added web-based installer which can:
-    * Check installation and run-time requirements
-    * Automatically generate the database configuration file
-    * Install pre-made 'install profiles' or distributions
-    * Import the database structure with automatic table prefixing
-    * Be localized
-- Added new default Garland theme
-- Added color module to change some themes' color schemes
-- Included the jQuery JavaScript library 1.0.4 and converted all core JavaScript to use it
-- Introduced the ability to alter mail sent from system
-- Module system:
-    * Added .info files for module meta-data
-    * Added support for module dependencies
-    * Improved module installation screen
-    * Moved core modules to their own directories
-    * Added support for module uninstalling
-- Added support for different cache backends
-- Added support for a generic "sites/all" directory.
-- Usability:
-    * Added support for auto-complete forms (AJAX) to user profiles.
-    * Made it possible to instantly assign roles to newly created user accounts.
-    * Improved configurability of the contact forms.
-    * Reorganized the settings pages.
-    * Made it easy to investigate popular search terms.
-    * Added a 'select all' checkbox and a range select feature to administration tables.
-    * Simplified the 'break' tag to split teasers from body.
-    * Use proper capitalization for titles, menu items and operations.
-- Integrated urlfilter.module into filter.module
-- Block system:
-    * Extended the block visibility settings with a role specific setting.
-    * Made it possible to customize all block titles.
-- Poll module:
-    * Optionally allow people to inspect all votes.
-    * Optionally allow people to cancel their vote.
-- Distributed authentication:
-    * Added default server option.
-- Added default robots.txt to control crawlers.
-- Database API:
-    * Added db_table_exists().
-- Blogapi module:
-    * 'Blogapi new' and 'blogapi edit' nodeapi operations.
-- User module:
-    * Added hook_profile_alter().
-    * E-mail verification is made optional.
-    * Added mass editing and filtering on admin/user/user.
-- PHP Template engine:
-    * Add the ability to look for a series of suggested templates.
-    * Look for page templates based upon the path.
-    * Look for block templates based upon the region, module, and delta.
-- Content system:
-    * Made it easier for node access modules to work well with each other.
-    * Added configurable content types.
-    * Changed node rendering to work with structured arrays.
-- Performance:
-    * Improved session handling: reduces database overhead.
-    * Improved access checking: reduces database overhead.
-    * Made it possible to do memcached based session management.
-    * Omit sidebars when serving a '404 - Page not found': saves CPU cycles and bandwidth.
-    * Added an 'aggressive' caching policy.
-    * Added a CSS aggregator and compressor (up to 40% faster page loads).
-- Removed the archive module.
-- Upgrade system:
-    * Created space for update branches.
-- Forms API:
-    * Made it possible to programmatically submit forms.
-    * Improved api for multistep forms.
-- Theme system:
-    * Split up and removed drupal.css.
-    * Added nested lists generation.
-    * Added a self-clearing block class.
-
-Drupal 4.7.11, 2008-01-10
--------------------------
-- fixed a security issue (Cross site request forgery), see SA-2008-005
-- fixed a security issue (Cross site scripting, UTF8), see SA-2008-006
-- fixed a security issue (Cross site scripting, register_globals), see SA-2008-007
-
-Drupal 4.7.10, 2007-12-06
--------------------------
-- fixed taxonomy feed bug introduced by SA-2007-031
-
-Drupal 4.7.9, 2007-12-05
-------------------------
-- fixed a security issue (SQL injection), see SA-2007-031
-
-Drupal 4.7.8, 2007-10-17
-----------------------
-- fixed a security issue (HTTP response splitting), see SA-2007-024
-- fixed a security issue (Cross site scripting via uploads), see SA-2007-026
-- fixed a security issue (API handling of unpublished comment), see SA-2007-030
-
-Drupal 4.7.7, 2007-07-26
-------------------------
-- fixed security issue (XSS), see SA-2007-018
-
-Drupal 4.7.6, 2007-01-29
-------------------------
-- fixed security issue (code execution), see SA-2007-005
-
-Drupal 4.7.5, 2007-01-05
-------------------------
-- Fixed security issue (XSS), see SA-2007-001
-- Fixed security issue (DoS), see SA-2007-002
-
-Drupal 4.7.4, 2006-10-18
-------------------------
-- Fixed security issue (XSS), see SA-2006-024
-- Fixed security issue (CSRF), see SA-2006-025
-- Fixed security issue (Form action attribute injection), see SA-2006-026
-
-Drupal 4.7.3, 2006-08-02
-------------------------
-- Fixed security issue (XSS), see SA-2006-011
-
-Drupal 4.7.2, 2006-06-01
-------------------------
-- Fixed critical upload issue, see SA-2006-007
-- Fixed taxonomy XSS issue, see SA-2006-008
-- Fixed a variety of small bugs.
-
-Drupal 4.7.1, 2006-05-24
-------------------------
-- Fixed critical SQL issue, see SA-2006-005
-- Fixed a serious upgrade related bug.
-- Fixed a variety of small bugs.
-
-Drupal 4.7.0, 2006-05-01
-------------------------
-- Added free tagging support.
-- Added a site-wide contact form.
-- Theme system:
-    * Added the PHPTemplate theme engine and removed the Xtemplate engine.
-    * Converted the bluemarine theme from XTemplate to PHPTemplate.
-    * Converted the pushbutton theme from XTemplate to PHPTemplate.
-- Usability:
-    * Reworked the 'request new password' functionality.
-    * Reworked the node and comment edit forms.
-    * Made it easy to add nodes to the navigation menu.
-    * Added site 'offline for maintenance' feature.
-    * Added support for auto-complete forms (AJAX).
-    * Added support for collapsible page sections (JS).
-    * Added support for resizable text fields (JS).
-    * Improved file upload functionality (AJAX).
-    * Reorganized some settings pages.
-    * Added friendly database error screens.
-    * Improved styling of update.php.
-- Refactored the forms API.
-    * Made it possible to alter, extend or theme forms.
-- Comment system:
-    * Added support for "mass comment operations" to ease repetitive tasks.
-    * Comment moderation has been removed.
-- Node system:
-    * Reworked the revision functionality.
-    * Removed the bookmarklet code. Third-party modules can now handle
-      This.
-- Upgrade system:
-    * Allows contributed modules to plug into the upgrade system.
-- Profiles:
-    * Added a block to display author information along with posts.
-    * Added support for private profile fields.
-- Statistics module:
-    * Added the ability to track page generation times.
-    * Made it possible to block certain IPs/hostnames.
-- Block system:
-    * Added support for theme-specific block regions.
-- Syndication:
-    * Made the aggregator module parse Atom feeds.
-    * Made the aggregator generate RSS feeds.
-    * Added RSS feed settings.
-- XML-RPC:
-    * Replaced the XML-RPC library by a better one.
-- Performance:
-    * Added 'loose caching' option for high-traffic sites.
-    * Improved performance of path aliasing.
-    * Added the ability to track page generation times.
-- Internationalization:
-    * Improved Unicode string handling API.
-    * Added support for PHP's multibyte string module.
-- Added support for PHP5's 'mysqli' extension.
-- Search module:
-    * Made indexer smarter and more robust.
-    * Added advanced search operators (e.g. phrase, node type, ...).
-    * Added customizable result ranking.
-- PostgreSQL support:
-    * Removed dependency on PL/pgSQL procedural language.
-- Menu system:
-    * Added support for external URLs.
-- Queue module:
-    * Removed from core.
-- HTTP handling:
-    * Added support for a tolerant Base URL.
-    * Output URIs relative to the root, without a base tag.
-
-Drupal 4.6.11, 2007-01-05
--------------------------
-- Fixed security issue (XSS), see SA-2007-001
-- Fixed security issue (DoS), see SA-2007-002
-
-Drupal 4.6.10, 2006-10-18
-------------------------
-- Fixed security issue (XSS), see SA-2006-024
-- Fixed security issue (CSRF), see SA-2006-025
-- Fixed security issue (Form action attribute injection), see SA-2006-026
-
-Drupal 4.6.9, 2006-08-02
-------------------------
-- Fixed security issue (XSS), see SA-2006-011
-
-Drupal 4.6.8, 2006-06-01
-------------------------
-- Fixed critical upload issue, see SA-2006-007
-- Fixed taxonomy XSS issue, see SA-2006-008
-
-Drupal 4.6.7, 2006-05-24
-------------------------
-- Fixed critical SQL issue, see SA-2006-005
-
-Drupal 4.6.6, 2006-03-13
-------------------------
-- Fixed bugs, including 4 security vulnerabilities.
-
-Drupal 4.6.5, 2005-12-12
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.6.4, 2005-11-30
-------------------------
-- Fixed bugs, including 3 security vulnerabilities.
-
-Drupal 4.6.3, 2005-08-15
-------------------------
-- Fixed bugs, including a critical "arbitrary PHP code execution" bug.
-
-Drupal 4.6.2, 2005-06-29
-------------------------
-- Fixed bugs, including two critical "arbitrary PHP code execution" bugs.
-
-Drupal 4.6.1, 2005-06-01
-------------------------
-- Fixed bugs, including a critical input validation bug.
-
-Drupal 4.6.0, 2005-04-15
-------------------------
-- PHP5 compliance
-- Search:
-    * Added UTF-8 support to make it work with all languages.
-    * Improved search indexing algorithm.
-    * Improved search output.
-    * Impose a throttle on indexing of large sites.
-    * Added search block.
-- Syndication:
-    * Made the ping module ping pingomatic.com which, in turn, will ping all the major ping services.
-    * Made Drupal generate RSS 2.0 feeds.
-    * Made RSS feeds extensible.
-    * Added categories to RSS feeds.
-    * Added enclosures to RSS feeds.
-- Flood control mechanism:
-    * Added a mechanism to throttle certain operations.
-- Usability:
-    * Refactored the block configuration pages.
-    * Refactored the statistics pages.
-    * Refactored the watchdog pages.
-    * Refactored the throttle module configuration.
-    * Refactored the access rules page.
-    * Refactored the content administration page.
-    * Introduced forum configuration pages.
-    * Added a 'add child page' link to book pages.
-- Contact module:
-    * Added a simple contact module that allows users to contact each other using e-mail.
-- Multi-site configuration:
-    * Made it possible to run multiple sites from a single code base.
-- Added an image API: enables better image handling.
-- Block system:
-    * Extended the block visibility settings.
-- Theme system:
-    * Added new theme functions.
-- Database backend:
-    * The PEAR database backend is no longer supported.
-- Performance:
-    * Improved performance of the forum topics block.
-    * Improved performance of the tracker module.
-    * Improved performance of the node pages.
-- Documentation:
-    * Improved and extended PHPDoc/Doxygen comments.
-
-Drupal 4.5.8, 2006-03-13
-------------------------
-- Fixed bugs, including 3 security vulnerabilities.
-
-Drupal 4.5.7, 2005-12-12
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.5.6, 2005-11-30
-------------------------
-- Fixed bugs, including 3 security vulnerabilities.
-
-Drupal 4.5.5, 2005-08-15
-------------------------
-- Fixed bugs, including a critical "arbitrary PHP code execution" bug.
-
-Drupal 4.5.4, 2005-06-29
-------------------------
-- Fixed bugs, including two critical "arbitrary PHP code execution" bugs.
-
-Drupal 4.5.3, 2005-06-01
-------------------------
-- Fixed bugs, including a critical input validation bug.
-
-Drupal 4.5.2, 2005-01-15
-------------------------
-- Fixed bugs: a cross-site scripting (XSS) vulnerability has been fixed.
-
-Drupal 4.5.1, 2004-12-01
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.5.0, 2004-10-18
-------------------------
-- Navigation:
-    * Made it possible to add, delete, rename and move menu items.
-    * Introduced tabs and subtabs for local tasks.
-    * Reorganized the navigation menus.
-- User management:
-    * Added support for multiple roles per user.
-    * Made it possible to add custom profile fields.
-    * Made it possible to browse user profiles by field.
-- Node system:
-    * Added support for node-level permissions.
-- Comment module:
-    * Made it possible to leave contact information without having to register.
-- Upload module:
-    * Added support for uploading documents (includes images).
-- Forum module:
-    * Added support for sticky forum topics.
-    * Made it possible to track forum topics.
-- Syndication:
-    * Added support for RSS ping-notifications of http://technorati.com/.
-    * Refactored the categorization of syndicated news items.
-    * Added an URL alias for 'rss.xml'.
-    * Improved date parsing.
-- Database backend:
-    * Added support for multiple database connections.
-    * The PostgreSQL backend does no longer require PEAR.
-- Theme system:
-    * Changed all GIFs to PNGs.
-    * Reorganised the handling of themes, template engines, templates and styles.
-    * Unified and extended the available theme settings.
-    * Added theme screenshots.
-- Blocks:
-    * Added 'recent comments' block.
-    * Added 'categories' block.
-- Blogger API:
-    * Added support for auto-discovery of blogger API via RSD.
-- Performance:
-    * Added support for sending gzip compressed pages.
-    * Improved performance of the forum module.
-- Accessibility:
-    * Improved the accessibility of the archive module's calendar.
-    * Improved form handling and error reporting.
-    * Added HTTP redirects to prevent submitting twice when refreshing right after a form submission.
-- Refactored 403 (forbidden) handling and added support for custom 403 pages.
-- Documentation:
-    * Added PHPDoc/Doxygen comments.
-- Filter system:
-    * Added support for using multiple input formats on the site
-    * Expanded the embedded PHP-code feature so it can be used everywhere
-    * Added support for role-dependant filtering, through input formats
-- UI translation:
-    * Managing translations is now completely done through the administration interface
-    * Added support for importing/exporting gettext .po files
-
-Drupal 4.4.3, 2005-06-01
-------------------------
-- Fixed bugs, including a critical input validation bug.
-
-Drupal 4.4.2, 2004-07-04
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.4.1, 2004-05-01
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.4.0, 2004-04-01
-------------------------
-- Added support for the MetaWeblog API and MovableType extensions.
-- Added a file API: enables better document management.
-- Improved the watchdog and search module to log search keys.
-- News aggregator:
-    * Added support for conditional GET.
-    * Added OPML feed subscription list.
-    * Added support for <image>, <pubDate>, <dc:date>, <dcterms:created>, <dcterms:issued> and <dcterms:modified>.
-- Comment module:
-    * Made it possible to disable the "comment viewing controls".
-- Performance:
-    * Improved module loading when serving cached pages.
-    * Made it possible to automatically disable modules when under heavy load.
-    * Made it possible to automatically disable blocks when under heavy load.
-    * Improved performance and memory footprint of the locale module.
-- Theme system:
-    * Made all theme functions start with 'theme_'.
-    * Made all theme functions return their output.
-    * Migrated away from using the BaseTheme class.
-    * Added many new theme functions and refactored existing theme functions.
-    * Added avatar support to 'Xtemplate'.
-    * Replaced theme 'UnConeD' by 'Chameleon'.
-    * Replaced theme 'Marvin' by 'Pushbutton'.
-- Usability:
-    * Added breadcrumb navigation to all pages.
-    * Made it possible to add context-sensitive help to all pages.
-    * Replaced drop-down menus by radio buttons where appropriate.
-    * Removed the 'magic_quotes_gpc = 0' requirement.
-    * Added a 'book navigation' block.
-- Accessibility:
-    * Made themes degrade gracefully in absence of CSS.
-    * Grouped form elements using '<fieldset>' and '<legend>' tags.
-    * Added '<label>' tags to form elements.
-- Refactored 404 (file not found) handling and added support for custom 404 pages.
-- Improved the filter system to prevent conflicts between filters:
-    * Made it possible to change the order in which filters are applied.
-- Documentation:
-    * Added PHPDoc/Doxygen comments.
-
-Drupal 4.3.2, 2004-01-01
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.3.1, 2003-12-01
-------------------------
-- Fixed bugs: no critical bugs were identified.
-
-Drupal 4.3.0, 2003-11-01
-------------------------
-- Added support for configurable URLs.
-- Added support for sortable table columns.
-- Database backend:
-    * Added support for selective database table prefixing.
-- Performance:
-    * Optimized many SQL queries for speed by converting left joins to inner joins.
-- Comment module:
-    * Rewrote the comment housekeeping code to be much more efficient and scalable.
-    * Changed the comment module to use the standard pager.
-- User module:
-    * Added support for multiple sessions per user.
-    * Added support for anonymous user sessions.
-- Forum module:
-    * Improved the forum views and the themability thereof.
-- Book module:
-    * Improved integration of non-book nodes in the book outline.
-- Usability:
-    * Added support for "mass node operations" to ease repetitive tasks.
-    * Added support for breadcrumb navigation to several modules' user pages.
-    * Integrated the administration pages with the normal user pages.
-
-Drupal 4.2.0, 2003-08-01
-------------------------
-- Added support for clean URLs.
-- Added textarea hook and support for onload attributes: enables integration of WYSIWYG editors.
-- Rewrote the RSS/RDF parser:
-    * It will now use PHP's built-in XML parser to parse news feeds.
-- Rewrote the administration pages:
-    * Improved the navigational elements and added breadcrumb navigation.
-    * Improved the look and feel.
-    * Added context-sensitive help.
-- Database backend:
-    * Fixed numerous SQL queries to make Drupal ANSI compliant.
-    * Added MSSQL database scheme.
-- Search module:
-    * Changed the search module to use implicit AND'ing instead of implicit OR'ing.
-- Node system:
-    * Replaced the "post content" permission by more fine-grained permissions.
-    * Improved content submission:
-        + Improved teasers: teasers are now optional, teaser length can be configured, teaser and body are edited in a single textarea, users will no longer be bothered with teasers when the post is too short for one.
-        + Added the ability to preview both the short and the full version of your posts.
-    * Extended the node API which allows for better integration.
-    * Added default node settings to control the behavior for promotion, moderation and other options.
-- Themes:
-    * Replaced theme "Goofy" by "Xtemplate", a template driven theme.
-- Removed the 'register_globals = on' requirement.
-- Added better installation instructions.
-
-Drupal 4.1.0, 2003-02-01
-------------------------
-- Collaboratively revised and expanded the Drupal documentation.
-- Rewrote comment.module:
-    * Reintroduced comment rating/moderation.
-    * Added support for comment paging.
-    * Performance improvements: improved comment caching, faster SQL queries, etc.
-- Rewrote block.module:
-    * Performance improvements: blocks are no longer rendered when not displayed.
-- Rewrote forum.module:
-    * Added a lot of features one can find in stand-alone forum software including but not limited to support for topic paging, added support for icons, rewrote the statistics module, etc.
-- Rewrote statistics.module:
-    * Collects access counts for each node, referrer logs, number of users/guests.
-    * Export blocks displaying top viewed nodes over last 24 hour period, top viewed nodes over all time, last nodes viewed, how many users/guest online.
-- Added throttle.module:
-    * Auto-throttle congestion control mechanism: Drupal can adapt itself based on the server load.
-- Added profile.module:
-    * Enables to extend the user and registration page.
-- Added pager support to the main page.
-- Replaced weblogs.module by ping.module:
-    * Added support for normal and RSS notifications of http://blo.gs/.
-    * Added support for RSS ping-notifications of http://weblogs.com/.
-- Removed the rating module
-- Themes:
-    * Removed a significant portion of hard-coded mark-up.
-
-Drupal 4.0.0, 2002-06-15
-------------------------
-- Added tracker.module:
-    * Replaces the previous "your [site]" links (recent comments and nodes).
-- Added weblogs.module:
-    * This will ping weblogs.com when new content is promoted.
-- Added taxonomy module which replaces the meta module.
-    * Supports relations, hierarchies and synonyms.
-- Added a caching system:
-    * Speeds up pages for anonymous users and reduces system load.
-- Added support for external SMTP libraries.
-- Added an archive extension to the calendar.
-- Added support for the Blogger API.
-- Themes:
-    * Cleaned up the theme system.
-    * Moved themes that are not maintained to contributions CVS repository.
-- Database backend:
-    * Changed to PEAR database abstraction layer.
-    * Using ANSI SQL queries to be more portable.
-- Rewrote the user system:
-    * Added support for Drupal authentication through XML-RPC and through a Jabber server.
-    * Added support for modules to add more user data.
-    * Users may delete their own account.
-    * Added who's new and who's online blocks.
-- Changed block system:
-    * Various hard coded blocks are now dynamic.
-    * Blocks can now be enabled and/or be set by the user.
-    * Blocks can be set to only show up on some pages.
-    * Merged box module with block module.
-- Node system:
-    * Blogs can be updated.
-    * Teasers (abstracts) on all node types.
-    * Improved error checking.
-    * Content versioning support.
-    * Usability improvements.
-- Improved book module to support text, HTML and PHP pages.
-- Improved comment module to mark new comments.
-- Added a general outliner which will let any node type be linked to a book.
-- Added an update script that lets you upgrade from previous releases or on a day to day basis when using the development tree.
-- Search module:
-    * Improved the search system by making it context sensitive.
-    * Added indexing.
-- Various updates:
-    * Changed output to valid XHTML.
-    * Improved multiple sites using the same Drupal database support.
-    * Added support for session IDs in URLs instead of cookies.
-    * Made the type of content on the front page configurable.
-    * Made each cloud site have its own settings.
-    * Modules and themes can now be enabled/disabled using the administration pages.
-    * Added URL abstraction for links.
-    * Usability changes (renamed links, better UI, etc).
-- Collaboratively revised and expanded the Drupal documentation.
-
-Drupal 3.0.1, 2001-10-15
-------------------------
-- Various updates:
-    * Added missing translations
-    * Updated the themes: tidied up some HTML code and added new Drupal logos.
-
-Drupal 3.0.0, 2001-09-15
-------------------------
-- Major overhaul of the entire underlying design:
-    * Everything is based on nodes: nodes are a conceptual "black box" to couple and manage different types of content and that promotes reusing existing code, thus reducing the complexity and size of Drupal as well as improving long-term stability.
-- Rewrote submission/moderation queue and renamed it to queue.module.
-- Removed FAQ and documentation module and merged them into a "book module".
-- Removed ban module and integrated it into account.module as "access control":
-    * Access control is based on much more powerful regular expressions (regex) now rather than on MySQL pattern matching.
-- Rewrote watchdog and submission throttle:
-    * Improved watchdog messages and added watchdog filter.
-- Rewrote headline code and renamed it to import.module and export.module:
-    * Added various improvements, including a better parser, bundles and better control over individual feeds.
-- Rewrote section code and renamed it to meta.module:
-    * Supports unlimited amount of nested topics. Topics can be nested to create a multi-level hierarchy.
-- Rewrote configuration file resolving:
-    * Drupal tries to locate a configuration file that matches your domain name or uses conf.php if the former failed. Note also that the configuration files got renamed from .conf to .php for security's sake on mal-configured Drupal sites.
-- Added caching support which makes Drupal extremely scalable.
-- Added access.module:
-    * Allows you to set up 'roles' (groups) and to bind a set of permissions to each group.
-- Added blog.module.
-- Added poll.module.
-- Added system.module:
-    * Moved most of the configuration options from hostname.conf to the new administration section.
-    * Added support for custom "filters".
-- Added statistics.module
-- Added moderate.module:
-    * Allows to assign users editorial/moderator rights to certain nodes or topics.
-- Added page.module:
-    * Allows creation of static (and dynamic) pages through the administration interface.
-- Added help.module:
-    * Groups all available module documentation on a single page.
-- Added forum.module:
-    * Added an integrated forum.
-- Added cvs.module and cvs-to-sql.pl:
-    * Allows to display and mail CVS log messages as daily digests.
-- Added book.module:
-    * Allows collaborative handbook writing: primary used for Drupal documentation.
-- Removed cron.module and integrated it into conf.module.
-- Removed module.module as it was no longer needed.
-- Various updates:
-    * Added "auto-post new submissions" feature versus "moderate new submissions".
-    * Introduced links/Drupal tags: [[link]]
-    * Added preview functionality when submitting new content (such as a story) from the administration pages.
-    * Made the administration section only show those links a user has access to.
-    * Made all modules use specific form_* functions to guarantee a rock-solid forms and more consistent layout.
-    * Improved scheduler:
-        + Content can be scheduled to be 'posted', 'queued' and 'hidden'.
-    * Improved account module:
-        + Added "access control" to allow/deny certain usernames/e-mail addresses/hostnames.
-    * Improved locale module:
-        + Added new overview to easy the translation process.
-    * Improved comment module:
-        + Made it possible to permanently delete comments.
-    * Improved rating module
-    * Improved story module:
-        + Added preview functionality for administrators.
-        + Made it possible to permanently delete stories.
-    * Improved themes:
-        + W3C validation on a best effort basis.
-        + Removed $theme->control() from themes.
-        + Added theme "goofy".
-- Collaboratively revised and expanded the Drupal documentation.
-
-Drupal 2.0.0, 2001-03-15
-------------------------
-- Rewrote the comment/discussion code:
-    * Comment navigation should be less confusing now.
-    * Additional/alternative display and order methods have been added.
-    * Modules can be extended with a "comment system": modules can embed the existing comment system without having to write their own, duplicate comment system.
-- Added sections and section manager:
-    * Story sections can be maintained from the administration pages.
-    * Story sections make the open submission more adaptive in that you can set individual post, dump and expiration thresholds for each section according to the story type and urgency level: stories in certain sections do not "expire" and might stay interesting and active as time passes by, whereas news-related stories are only considered "hot" over a short period of time.
-- Multiple vhosts + multiple directories:
-    * You can set up multiple Drupal sites on top of the same physical source tree either by using vhosts or sub-directories.
-- Added "user ratings" similar to SlashCode's Karma or Scoop's Mojo:
-    * All rating logic is packed into a module to ease experimenting with different rating heuristics/algorithms.
-- Added "search infrastructure":
-    * Improved search page and integrated search functionality in the administration pages.
-- Added translation / localization / internationalization support:
-    * Because many people would love to see their website showing a lot less of English, and far more of their own language, Drupal provides a framework to set up a multi-lingual website or to overwrite the default English text in English.
-- Added fine-grained user permission (or group) system:
-    * Users can be granted access to specific administration sections. Example: a FAQ maintainer can be given access to maintain the FAQ and translators can be given access to the translation pages.
-- Added FAQ module
-- Changed the "open submission queue" into a (optional) module.
-- Various updates:
-    * Improved account module:
-        + User accounts can be deleted.
-        + Added fine-grained permission support.
-    * Improved block module
-    * Improved diary module:
-        + Diary entries can be deleted
-    * Improved headline module:
-        + Improved parser to support more "generic" RDF/RSS/XML backend.
-    * Improved module module
-    * Improved watchdog module
-    * Improved database abstraction layer
-    * Improved themes:
-        + W3C validation on a best effort basis
-        + Added theme "example" (alias "Stone Age")
-    * Added new scripts to directory "scripts"
-    * Added directory "misc"
-    * Added CREDITS file
-- Revised documentation
-
-Drupal 1.0.0, 2001-01-15
-------------------------
-- Initial release
diff --git a/doc/CHANGELOG.txt b/doc/CHANGELOG.txt
new file mode 100644
index 0000000..b870969
--- /dev/null
+++ b/doc/CHANGELOG.txt
@@ -0,0 +1,94 @@
+SuiteDesk 0.1.0, 2017-07-24
+---------------------------
+- Initial release:
+    * Based on Drupal 6.38 - Final release (2016-02-24)
+    * Main modules:
+        Advanced CSS/JS Aggregation
+        + Advanced CSS/JS Aggregation 6.x-1.9
+
+        CCK
+        + CCK 6.x-3.0-alpha4
+        + Autocomplete Widgets 6.x-1.4
+        + Computed Field 6.x-1.0
+        + Content Taxonomy 6.x-1.0-rc2
+        + FileField 6.x-3.14
+        + Link 6.x-2.11
+        + Viewfield 6.x-2.0
+
+        Core - extended
+        + Administer Users by Role 6.x-1.4
+        + Administration menu 6.x-1.9
+        + Autosave 6.x-2.11
+        + Better Formats 6.x-1.2
+        + BookMadeSimple 6.x-3.4
+        + Clone module 6.x-1.3
+        + Custom Error 6.x-1.4
+        + Diff 6.x-2.3
+        + Extended Path Aliases 6.x-1.3
+        + Frequently Asked Questions 6.x-1.13
+        + Lexicon 6.x-1.4
+        + Link checker 6.x-2.8
+        + Node Comment 6.x-3.0-beta1
+        + Pathauto 6.x-1.6
+        + Recently read 6.x-1.0-beta1
+        + Role Delegation 6.x-1.4
+        + Search Restrict 6.x-1.5
+        + Token 6.x-1.19
+        + View revisions by content type 6.x-1.1
+        + Vocabulary Permissions Per Role 6.x-1.1
+        + Watcher 6.x-1.4
+
+        Custom Breadcrumbs
+        + Custom Breadcrumbs 6.x-2.0-rc1
+
+        Custom Search
+        + Custom Search 6.x-1.13
+
+        Date/Time
+        + Date 6.x-2.10
+        + Calendar 6.x-2.4
+
+        Image
+        + ImageAPI 6.x-1.10
+        + ImageCache 6.x-2.0-rc1
+
+        Input filters
+        + GeSHi Filter 6.x-1.5
+        + HTML Purifier 6.x-2.4
+        + Pathologic 6.x-3.4
+
+        Multilanguage
+        + Internationalization 6.x-1.10
+        + Transliteration 6.x-3.1
+
+        Printer, email and PDF versions
+        + Printer-friendly pages 6.x-1.19
+
+        Security
+        + Generate Password 6.x-1.4
+        + Password policy 6.x-1.11
+        + Secure Password Hashes 6.x-2.1
+        + Secure Pages 6.x-2.1
+        + Secure Pages Hijack Prevention 6.x-2.0-rc1
+
+        Storm
+        + Storm 6.x-2.2
+        + Storm Quick TimeTracker 6.x-2.x-dev
+
+        User interface
+        + CKEditor 6.x-1.15
+        + CKEditor Link 6.x-2.4
+        + External Links 6.x-1.17
+        + jQuery UI 6.x-1.5
+        + Lightbox2 6.x-1.11
+
+        Views
+        + Views 6.x-2.18
+
+    * Main libraries:
+        + CKEditor 4.6.1
+        + GeSHi - Generic Syntax Highlighter 1.0.8.11
+        + HTML Purifier Library 4.8.0
+        + jQuery UI 1.6
+        + TCPDF 6.2.6
+        + wkhtmltopdf 0.12.4
diff --git a/COPYRIGHT.txt b/doc/COPYRIGHT.txt
similarity index 100%
rename from COPYRIGHT.txt
rename to doc/COPYRIGHT.txt
diff --git a/INSTALL.mysql.txt b/doc/INSTALL.mysql.txt
similarity index 100%
rename from INSTALL.mysql.txt
rename to doc/INSTALL.mysql.txt
diff --git a/INSTALL.pgsql.txt b/doc/INSTALL.pgsql.txt
similarity index 100%
rename from INSTALL.pgsql.txt
rename to doc/INSTALL.pgsql.txt
diff --git a/INSTALL.txt b/doc/INSTALL.txt
similarity index 100%
rename from INSTALL.txt
rename to doc/INSTALL.txt
diff --git a/LICENSE.txt b/doc/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to doc/LICENSE.txt
diff --git a/MAINTAINERS.txt b/doc/MAINTAINERS.txt
similarity index 100%
rename from MAINTAINERS.txt
rename to doc/MAINTAINERS.txt
diff --git a/UPGRADE.txt b/doc/UPGRADE.txt
similarity index 100%
rename from UPGRADE.txt
rename to doc/UPGRADE.txt
diff --git a/modules/admin_menu/admin_menu.info b/modules/admin_menu/admin_menu.info
index dd5ce05..9ebb63f 100644
--- a/modules/admin_menu/admin_menu.info
+++ b/modules/admin_menu/admin_menu.info
@@ -1,6 +1,6 @@
 name = Administration menu
 description = "Provides a dropdown menu to most administrative tasks and other common destinations (to users with the proper permissions)."
-package = Core - optional
+package = Core - extended
 core = 6.x
 
 ; Information added by Drupal.org packaging script on 2015-02-21
@@ -8,4 +8,3 @@ version = "6.x-1.9"
 core = "6.x"
 project = "admin_menu"
 datestamp = "1424535792"
-
diff --git a/modules/nodecomment/nodecomment.info b/modules/nodecomment/nodecomment.info
index f62a0c3..9d08fd3 100644
--- a/modules/nodecomment/nodecomment.info
+++ b/modules/nodecomment/nodecomment.info
@@ -1,6 +1,6 @@
 name = Node Comment
 description = Allows users to comment on and discuss published content using nodes.
-package = Core - optional
+package = Core - extended
 dependencies[] = views
 dependencies[] = comment
 core = 6.x
@@ -9,4 +9,3 @@ version = "6.x-3.0-beta1"
 core = "6.x"
 project = "nodecomment"
 datestamp = "1353097067"
-
diff --git a/modules/path_alias_xt/path_alias_xt.info b/modules/path_alias_xt/path_alias_xt.info
index 129a214..cfce33c 100644
--- a/modules/path_alias_xt/path_alias_xt.info
+++ b/modules/path_alias_xt/path_alias_xt.info
@@ -1,5 +1,6 @@
 name = Extended Path Aliases
 description = Automatically extend path aliases to include tabs, like "about-us/edit" for "node/123/edit". Allow these aliases to be entered in page specification wild-cards ("about-us*"), e.g for block visibility.
+package = Core - extended
 core = "6.x"
 ; While you will need to enable the core Path module to enter aliases,
 ; programmatically path_alias_xt has no dependency on it. Existing aliases
@@ -10,4 +11,3 @@ version = "6.x-1.3"
 core = "6.x"
 project = "path_alias_xt"
 datestamp = "1382565626"
-
diff --git a/modules/pathauto/pathauto.info b/modules/pathauto/pathauto.info
index 2c7904d..670d76b 100644
--- a/modules/pathauto/pathauto.info
+++ b/modules/pathauto/pathauto.info
@@ -1,5 +1,6 @@
 name = Pathauto
 description = Provides a mechanism for modules to automatically generate aliases for the content they manage.
+package = Core - extended
 dependencies[] = path
 dependencies[] = token
 core = 6.x
@@ -10,4 +11,3 @@ version = "6.x-1.6"
 core = "6.x"
 project = "pathauto"
 datestamp = "1320076535"
-
diff --git a/modules/transliteration/transliteration.info b/modules/transliteration/transliteration.info
index 2548d48..128313b 100644
--- a/modules/transliteration/transliteration.info
+++ b/modules/transliteration/transliteration.info
@@ -1,5 +1,6 @@
 name = Transliteration
 description = Converts non-latin text to US-ASCII and sanitizes file names.
+package = Multilanguage
 core = 6.x
 
 
@@ -8,4 +9,3 @@ version = "6.x-3.1"
 core = "6.x"
 project = "transliteration"
 datestamp = "1338540716"
-
diff --git a/sites/all/modules/administerusersbyrole/administerusersbyrole.info b/sites/all/modules/administerusersbyrole/administerusersbyrole.info
index e24f0df..f9c8400 100644
--- a/sites/all/modules/administerusersbyrole/administerusersbyrole.info
+++ b/sites/all/modules/administerusersbyrole/administerusersbyrole.info
@@ -1,6 +1,7 @@
 ; $Id: administerusersbyrole.info,v 1.1.2.2 2009/06/29 16:06:09 smokris Exp $
 name = Administer Users by Role
 description = "Allows users with 'administer users' permission and a role (specified in 'Permissions') to edit/delete other users with a specified role.  Also provides control over user creation."
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2009-06-29
@@ -8,4 +9,3 @@ version = "6.x-1.4"
 core = "6.x"
 project = "administerusersbyrole"
 datestamp = "1246292114"
-
diff --git a/sites/all/modules/autosave/autosave.info b/sites/all/modules/autosave/autosave.info
index 509e011..d86eb88 100644
--- a/sites/all/modules/autosave/autosave.info
+++ b/sites/all/modules/autosave/autosave.info
@@ -1,7 +1,7 @@
 name = Autosave
 description = Saves node edits in the background in case browser dies while editing.
 
-package = Other
+package = Core - extended
 project = autosave
 
 core = 6.x
@@ -13,4 +13,3 @@ version = "6.x-2.11"
 core = "6.x"
 project = "autosave"
 datestamp = "1344266211"
-
diff --git a/sites/all/modules/better_formats/better_formats.info b/sites/all/modules/better_formats/better_formats.info
index f53a037..686b009 100644
--- a/sites/all/modules/better_formats/better_formats.info
+++ b/sites/all/modules/better_formats/better_formats.info
@@ -1,6 +1,7 @@
 ; $Id: better_formats.info,v 1.1.2.2 2009/02/25 06:44:17 dragonwize Exp $
 name = Better Formats
 description = Enhances the core input format system by managing input format defaults and settings.
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2010-02-05
@@ -8,4 +9,3 @@ version = "6.x-1.2"
 core = "6.x"
 project = "better_formats"
 datestamp = "1265402405"
-
diff --git a/sites/all/modules/book_made_simple/book_made_simple.info b/sites/all/modules/book_made_simple/book_made_simple.info
index b28fafc..24dc13c 100644
--- a/sites/all/modules/book_made_simple/book_made_simple.info
+++ b/sites/all/modules/book_made_simple/book_made_simple.info
@@ -1,6 +1,6 @@
 name = BookMadeSimple
 description = Automatic creation of a book and simple creation of child pages.
-package = Content
+package = Core - extended
 dependencies[] = book
 core=6.x
 ; Information added by drupal.org packaging script on 2008-01-11
@@ -20,4 +20,3 @@ version = "6.x-3.4"
 core = "6.x"
 project = "book_made_simple"
 datestamp = "1348472235"
-
diff --git a/sites/all/modules/customerror/customerror.info b/sites/all/modules/customerror/customerror.info
index 3af49ba..9cd5eaf 100644
--- a/sites/all/modules/customerror/customerror.info
+++ b/sites/all/modules/customerror/customerror.info
@@ -1,5 +1,6 @@
 name = Custom Error
 description = Enables the creation of custom error pages for 404 and 403 errors, as well as redirects for 404s.
+package = Core - extended
 core=6.x
 
 ; Information added by Drupal.org packaging script on 2014-08-17
@@ -7,4 +8,3 @@ version = "6.x-1.4"
 core = "6.x"
 project = "customerror"
 datestamp = "1408264129"
-
diff --git a/sites/all/modules/diff/diff.info b/sites/all/modules/diff/diff.info
index 15f3915..4b6c486 100644
--- a/sites/all/modules/diff/diff.info
+++ b/sites/all/modules/diff/diff.info
@@ -1,5 +1,6 @@
 name = Diff
 description = Show difference between node revisions.
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2011-08-07
@@ -7,4 +8,3 @@ version = "6.x-2.3"
 core = "6.x"
 project = "diff"
 datestamp = "1312697033"
-
diff --git a/sites/all/modules/faq/faq.info b/sites/all/modules/faq/faq.info
index 4c67734..b0e2cc8 100644
--- a/sites/all/modules/faq/faq.info
+++ b/sites/all/modules/faq/faq.info
@@ -1,5 +1,6 @@
 name = Frequently Asked Questions
 description = "Manages configuration of questions for a FAQ page."
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2012-02-22
@@ -7,4 +8,3 @@ version = "6.x-1.13"
 core = "6.x"
 project = "faq"
 datestamp = "1329951344"
-
diff --git a/sites/all/modules/geshifilter/geshifield/geshifield.info b/sites/all/modules/geshifilter/geshifield/geshifield.info
index a9868d4..df2d54b 100644
--- a/sites/all/modules/geshifilter/geshifield/geshifield.info
+++ b/sites/all/modules/geshifilter/geshifield/geshifield.info
@@ -1,6 +1,6 @@
 name = "GeSHi field"
 description = "Provides a CCK field for source code with GeSHI syntax highlighting."
-package = "Filters"
+package = "Input filters"
 core = 6.x
 dependencies[] = content
 dependencies[] = geshifilter
@@ -10,4 +10,3 @@ version = "6.x-1.5"
 core = "6.x"
 project = "geshifilter"
 datestamp = "1363644611"
-
diff --git a/sites/all/modules/geshifilter/geshifilter.info b/sites/all/modules/geshifilter/geshifilter.info
index a2c6599..c5bf5ac 100644
--- a/sites/all/modules/geshifilter/geshifilter.info
+++ b/sites/all/modules/geshifilter/geshifilter.info
@@ -1,6 +1,6 @@
 name = "GeSHi Filter"
 description = "Provides a filter to highlight source code using the GeSHi library (Generic Syntax Highlighter)"
-package = "Filters"
+package = "Input filters"
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2013-03-18
@@ -8,4 +8,3 @@ version = "6.x-1.5"
 core = "6.x"
 project = "geshifilter"
 datestamp = "1363644611"
-
diff --git a/sites/all/modules/geshifilter/geshinode.info b/sites/all/modules/geshifilter/geshinode.info
index e3c6af9..8c2ca63 100644
--- a/sites/all/modules/geshifilter/geshinode.info
+++ b/sites/all/modules/geshifilter/geshinode.info
@@ -1,6 +1,6 @@
 name = "GeSHi node"
 description = "Provides source code node with GeSHi syntax highlighting."
-package = "Filters"
+package = "Input filters"
 dependencies[] = geshifilter
 core = 6.x
 
@@ -9,4 +9,3 @@ version = "6.x-1.5"
 core = "6.x"
 project = "geshifilter"
 datestamp = "1363644611"
-
diff --git a/sites/all/modules/htmlpurifier/htmlpurifier.info b/sites/all/modules/htmlpurifier/htmlpurifier.info
index 2c10ddd..9d895d8 100644
--- a/sites/all/modules/htmlpurifier/htmlpurifier.info
+++ b/sites/all/modules/htmlpurifier/htmlpurifier.info
@@ -1,6 +1,7 @@
 ; $Id: htmlpurifier.info,v 1.6 2008/04/24 04:13:09 ezyang Exp $
 name = "HTML Purifier"
 description = "Filter that removes malicious HTML and ensures standards compliant output."
+package = "Input filters"
 core = 6.x
 php = 5.0.5
 
@@ -9,4 +10,3 @@ version = "6.x-2.4"
 core = "6.x"
 project = "htmlpurifier"
 datestamp = "1287798330"
-
diff --git a/sites/all/modules/i18n/tests/drupal_i18n_test_case.php b/sites/all/modules/i18n/tests/drupal_i18n_test_case.php
deleted file mode 100644
index 76149bf..0000000
--- a/sites/all/modules/i18n/tests/drupal_i18n_test_case.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-// Core: Id: drupal_web_test_case.php,v 1.96 2009/04/22 09:57:10 dries Exp
-/**
- * @file
- * Provide required modifications to Drupal 7 core DrupalWebTestCase in order
- * for it to function properly in Drupal 6.
- *
- * Copyright 2008-2009 by Jimmy Berry ("boombatower", http://drupal.org/user/214218)
- */
-
-require_once drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php';
-
-/**
- * Test case for typical Drupal tests.
- */
-class Drupali18nTestCase extends DrupalWebTestCase {
-  // We may want to install the site in a different language
-  var $install_locale = 'en';
-
-  /**
-   * Adds a language
-   *
-   * @param $langcode
-   * @param $default
-   *   Whether this is the default language
-   * @param $load
-   *   Whether to load available translations for that language
-   */
-  function addLanguage($langcode, $default = FALSE, $load = TRUE) {
-    require_once './includes/locale.inc';
-    // Enable installation language as default site language.
-    locale_add_language($langcode, NULL, NULL, NULL, NULL, NULL, 1, $default);
-    // Reset language list
-    language_list('language', TRUE);
-    // We may need to refresh default language
-    drupal_init_language();
-    // @todo import po files for this language
-  }
-
-  /**
-   * Create translation set from a node
-   *
-   * @param $source
-   *   Source node
-   * @param $languages
-   *   Optional list of language codes
-   */
-  function drupalCreateTranslations(&$source, $languages = NULL) {
-    $languages = $languages ? $languages : array_keys(language_list());
-    if (empty($source->tnid)) {
-      db_query("UPDATE {node} SET tnid = %d, translate = %d WHERE nid = %d", $source->nid, 0, $source->nid);
-      $source->tnid = $source->nid;
-    }
-    $translations[$source->language] = $source;
-    foreach ($languages as $lang) {
-      if ($lang != $source->language) {
-        $translations[$lang] = $this->drupalCreateNode(array('type' => $source->type, 'language' => $lang, 'translation_source' => $source, 'status' => $source->status, 'promote' => $source->promote, 'uid' => $source->uid));
-      }
-    }
-    return $translations;
-  }
-
-  /**
-   * Enable language switcher block
-   */
-  function enableBlock($module, $delta, $region = 'left') {
-    db_query("UPDATE {blocks} SET status = %d, weight = %d, region = '%s', throttle = %d WHERE module = '%s' AND delta = '%s' AND theme = '%s'", 1, 0, $region, 0, $module, $delta, variable_get('theme_default', 'garland'));
-    cache_clear_all();
-  }
-  /**
-   * Reset theme to default so we can play with blocks
-   */
-  function initTheme() {
-    global $theme, $theme_key;
-    unset($theme);
-    unset($theme_key);
-    init_theme();
-    _block_rehash();
-  }
-  /**
-   * Generates a random database prefix, runs the install scripts on the
-   * prefixed database and enable the specified modules. After installation
-   * many caches are flushed and the internal browser is setup so that the
-   * page requests will run on the new prefix. A temporary files directory
-   * is created with the same name as the database prefix.
-   *
-   * @param ...
-   *   List of modules to enable for the duration of the test.
-   */
-  function setUp() {
-    global $db_prefix, $user, $language; // $language (Drupal 6).
-    global $install_locale;
-
-    // Store necessary current values before switching to prefixed database.
-    $this->db_prefix_original = $db_prefix;
-    $clean_url_original = variable_get('clean_url', 0);
-
-    // Generate temporary prefixed database to ensure that tests have a clean starting point.
-    $db_prefix = 'simpletest' . mt_rand(1000, 1000000);
-
-    include_once './includes/install.inc';
-
-    drupal_install_system();
-
-    // Add the specified modules to the list of modules in the default profile.
-    $args = func_get_args();
-    // Add language and basic i18n modules
-    $install_locale = $this->install_locale;
-    $i18n_modules = array('locale', 'translation', 'i18n', 'i18n_test');
-    $modules = array_unique(array_merge(drupal_verify_profile('default', $this->install_locale), $args, $i18n_modules));
-    drupal_install_modules($modules);
-
-    // Install locale
-    if ($this->install_locale != 'en') {
-      $this->addLanguage($this->install_locale, TRUE);
-    }
-    // Run default profile tasks.
-    $task = 'profile';
-    default_profile_tasks($task, '');
-
-    // Rebuild caches.
-    actions_synchronize();
-    _drupal_flush_css_js();
-    $this->refreshVariables();
-    $this->checkPermissions(array(), TRUE);
-    user_access(NULL, NULL, TRUE); // Drupal 6.
-
-    // Log in with a clean $user.
-    $this->originalUser = $user;
-//    drupal_save_session(FALSE);
-//    $user = user_load(1);
-    session_save_session(FALSE);
-    $user = user_load(array('uid' => 1));
-
-    // Restore necessary variables.
-    variable_set('install_profile', 'default');
-    variable_set('install_task', 'profile-finished');
-    variable_set('clean_url', $clean_url_original);
-    variable_set('site_mail', 'simpletest@example.com');
-
-    // Use temporary files directory with the same prefix as database.
-    $this->originalFileDirectory = file_directory_path();
-    variable_set('file_directory_path', file_directory_path() . '/' . $db_prefix);
-    $directory = file_directory_path();
-    // Create the files directory.
-    file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
-
-    set_time_limit($this->timeLimit);
-
-    // Some more includes
-    require_once 'includes/language.inc';
-    // Refresh theme
-    $this->initTheme();
-    // Set path languages so we can retrieve pages in different languages
-    variable_set('language_negotiation', LANGUAGE_NEGOTIATION_PATH);
-  }
-
-  /**
-   * Delete created files and temporary files directory, delete the tables created by setUp(),
-   * and reset the database prefix.
-   */
-  protected function tearDown() {
-    parent::tearDown();
-
-    // Reset language list
-    language_list('language', TRUE);
-    drupal_init_language();
-    if (module_exists('locale')) {
-      locale(NULL, NULL, TRUE);
-    }
-  }
-
-  /**
-   * Retrieves a Drupal path or an absolute path with language
-   */
-  protected function i18nGet($langcode, $path = '', array $options = array(), array $headers = array()) {
-    $options += array('language' => $this->getLanguage($langcode));
-    return $this->drupalGet($path, $options, $headers);
-  }
-  /**
-   * Get language object for langcode
-   */
-  public function getLanguage($langcode) {
-    if (is_object($langcode)) {
-      return $langcode;
-    }
-    else {
-      $language_list = language_list();
-      return $language_list[$langcode];
-    }
-  }
-  /**
-   * Switch global language
-   */
-  public function switchLanguage($newlang = NULL) {
-    $newlang = $newlang ? $newlang : $this->install_locale;
-    $GLOBALS['language'] = $this->getLanguage($newlang); 
-  }
-  
-  /**
-   * Get all languages that are not default
-   */
-  public function getOtherLanguages() {
-    $languages = language_list();
-    unset($languages[language_default('language')]);
-    return $languages;
-  }
-  /**
-   * Create and store one translation into the db
-   */
-  public function i18nstringsCreateTranslation($name, $lang, $length = 20) {
-    $translation = $this->randomName($length, "i18n-$lang-");
-    $count = self::i18nstringsSaveTranslation($name, $lang, $translation);
-    $this->assertTrue($count, "A translation($lang) has been created for string $name");
-    return $translation;
-  }
-  /**
-   * Translate one string into the db
-   */
-  public static function i18nstringsSaveTranslation($name, $lang, $translation, $update = FALSE) {
-    $source = i18nstrings_get_source($name);
-    if ($source) {
-      if ($update) {
-        db_query("UPDATE {locales_target} SET translation = '%s' WHERE lid = %d AND language = '%s'", $translation, $source->lid, $lang);    
-      } else {
-        db_query("INSERT INTO {locales_target} (translation, lid, language) VALUES ('%s', %d, '%s')", $translation, $source->lid, $lang);
-      }
-      return db_affected_rows();
-    }
-    else {
-      return 0;
-    }
-  }
-  /**
-   * Print out a variable for debugging
-   */
-  function printDebug($data, $title = '') {
-    $string = is_array($data) || is_object($data) ? print_r($data, TRUE) : $data;
-    $output = $title ? $title . ':' . $string : $string;
-    //$this->assertTrue(TRUE, $output);
-    $this->assertTrue(TRUE, $output, 'Debug');
-  }
-  /**
-   * Debug dump object with some formatting
-   */
-  function printObject($object, $title = 'Object') {
-    $output = $this->formatTable($object);
-    $this->printDebug($output, $title);
-  }
-
-  /**
-   * Print out current HTML page
-   */
-  function printPage() {
-    $this->printDebug($this->drupalGetContent());
-  }
-
-  // Dump table contents
-  function dumpTable($table) {
-    $result = db_query('SELECT * FROM {' . $table . '}');
-    $output = 'Table dump <strong>' . $table . '</strong>:';
-    while ($row = db_fetch_array($result)) {
-      $rows[] = $row;
-      if (empty($header)) {
-        $header = array_keys($row);
-      }
-    }
-    if (!empty($rows)) {
-      $output .= theme('table', $header, $rows);
-    } else {
-      $output .= ' No rows';
-    }
-    $this->assertTrue(TRUE, $output);
-  }
-
-  /**
-   * Format object as table, recursive
-   */
-  function formatTable($object) {
-    foreach ($object as $key => $value) {
-      $rows[] = array(
-        $key,
-        is_array($value) || is_object($value) ? $this->formatTable($value) : $value,
-      );
-    }
-    if (!empty($rows)) {
-      return theme('table', array(), $rows);
-    }
-    else {
-      return 'No properties';
-    }
-  }
-}
\ No newline at end of file
diff --git a/sites/all/modules/i18n/tests/i18n_api.test b/sites/all/modules/i18n/tests/i18n_api.test
deleted file mode 100644
index 42fe9b5..0000000
--- a/sites/all/modules/i18n/tests/i18n_api.test
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Class for testing messaging module.
- *
- * Tests basic API functions
- */
-
-require_once 'drupal_i18n_test_case.php';
-
-class i18n_API_Tests extends Drupali18nTestCase {
-
-  function getInfo() {
-    return array(
-      'name' => 'Internationalization API',
-      'group' => 'Internationalization',
-      'description' => 'Internationalization API functions'
-    );
-  }
-
-  function setUp() {
-    parent::setUp('i18n', 'locale');
-    $this->addLanguage('es');
-    $this->addLanguage('de');
-    // A language with two letter code may help too
-    $this->addLanguage('pt-br');
-
-    //variable_set('i18n_variables', array('site_name','site_frontpage',));
-
-    // Log in user with access content permission
-    $user = $this->drupalCreateUser(array('access comments', 'access content'));
-    $this->drupalLogin($user);
-  }
-
-  function testBasicAPI() {
-    $language_count = count(language_list());
-    $this->assertTrue($language_count > 1, 'Multiple languages created: ' . $language_count);
-    $this->assertEqual(i18n_get_lang(), 'en', 'Default language (en) properly set.');
-
-    // Set site name for each language and check pages later
-    foreach (language_list() as $lang) {
-      i18n_variable_set('site_name', "Drupal-$lang->name", $lang->language);
-    }
-
-    // Enable language switcher block
-    //$this->enableBlock('locale', 0);
-    //$this->dumpTable('blocks');
-
-    // Create some content and check selection modes
-    variable_set('language_content_type_story', 1);
-    $neutral = $this->drupalCreateNode(array('type' => 'story', 'promote' => 1));
-    $source = $this->drupalCreateNode(array('type' => 'story', 'promote' => 1, 'language' => i18n_default_language()));
-    $translations = $this->drupalCreateTranslations($source);
-    // This fails because the _get_translations() function has static caching
-    //$this->assertEqual(count(translation_node_get_translations($source->tnid)), $language_count, "Created $language_count $source->type translations.");
-    $this->assertEqual(count($translations), $language_count, "Created $language_count $source->type translations.");
-
-    // Default selection module, only language neutral and current
-    variable_set('i18n_selection_mode', 'simple');
-    foreach (language_list() as $lang) {
-      $this->drupalGet('', array('language' => $lang));
-      $this->assertText("Drupal-$lang->name", 'Checked translated site name: Drupal-' . $lang->name);
-      $display = array($translations[$lang->language], $neutral);
-      $hide = $translations;
-      unset($hide[$lang->language]);
-      $this->assertContent($display, $hide);
-    }
-
-  }
-
-  /**
-   * Check some nodes are displayed, some are not
-   */
-  function assertContent($display, $hide = array()) {
-    $languages = language_list();
-    foreach ($display as $node) {
-      $name = $node->language ? $languages[$node->language]->name : 'Language neutral';
-      $this->assertText($node->title, 'Content displayed for ' . $name);
-    }
-    foreach ($hide as $node) {
-      $name = $node->language ? $languages[$node->language]->name : 'Language neutral';
-      $this->assertNoText($node->title, 'Content not displayed for ' . $name);
-    }
-  }
-}
\ No newline at end of file
diff --git a/sites/all/modules/i18n/tests/i18n_blocks.test b/sites/all/modules/i18n/tests/i18n_blocks.test
deleted file mode 100644
index a31e116..0000000
--- a/sites/all/modules/i18n/tests/i18n_blocks.test
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Class for testing messaging module.
- *
- * Tests basic API functions
- */
-
-require_once 'i18n_strings.test';
-
-class i18n_Blocks_Test extends Drupali18nTestCase {
-
-  function getInfo() {
-    return array(
-      'name' => 'Block translation',
-      'group' => 'Internationalization',
-      'description' => 'Block translation functions'
-    );
-  }
-
-  function setUp() {
-    parent::setUp('118n', 'locale', 'i18nstrings', 'i18nblocks');
-    $this->addLanguage('es');
-    $this->addLanguage('de');
-     // Create and login user
-    $admin_user = $this->drupalCreateUser(array('administer blocks'));
-    $this->drupalLogin($admin_user);
-  }
-
-  function testBlockTranslation() {
-    // Create a translatable block
-    $box = $this->i18nCreateBox(array('language' => I18N_BLOCK_LOCALIZE));
-    $i18nblock = i18nblocks_load('block', $box->bid);
-    $this->assertTrue($i18nblock->ibid && $i18nblock->language == I18N_BLOCK_LOCALIZE, "The block has been created with the right i18n settings.");
-    // Create translations for title and body, source strings should be already there
-    $translations = $this->i18nTranslateBlock('block', $box-bid, array('title', 'body'));
-    // Now set a language for the block and confirm it shows just for that one (without translation)
-    $languages = $this->getOtherLanguages();
-    $setlanguage = array_shift($languages);
-    $otherlanguage = array_shift($languages);
-    $this->i18nUpdateBlock('block', $box->bid, array('language' => $setlanguage->language));
-    // Do not show in default language
-    $this->drupalGet('');
-    $this->assertNoText($box->title);
-    // Show in block's language but not translated
-    $this->i18nGet($setlanguage);
-    $this->assertText($box->title);
-    // Do not show in the other language
-    $this->i18nGet($otherlanguage);
-    $this->assertNoText($box->title);
-    $this->assertNoText($translations[$otherlanguage->language]['title']);
-    
-    // Add a custom title to any other block: Navigation (user, 1)
-    $title = $this->randomName(10);
-    $this->i18nUpdateBlock('user', 1, array('title' => $title));
-    $this->assertText($title, "The new custom title is displayed on the home page.");
-    $translate = $this->i18nTranslateBlock('user', 1, array('title'));
-    $this->drupalGet('');
-    
-    // Refresh block strings, the ones for the first box should be gone. Not the others
-    $box2 = $this->i18nCreateBox(array('language' => I18N_BLOCK_LOCALIZE));
-    $translations = $this->i18nTranslateBlock('block', $box2->bid, array('title', 'body'));
-    i18nstrings_refresh_group('blocks', TRUE);
-    $this->assertFalse(i18nstrings_get_source("blocks:block:$box->bid:title", $box->title), "The string for the box title is gone.");
-    $this->assertFalse(i18nstrings_get_source("blocks:block:$box->bid:body", $box->body), "The string for the box body is gone.");
-    $this->assertTrue(i18nstrings_get_source("blocks:user:1:title"), "We have a string for the Navigation block title");
-    $this->assertTrue(i18nstrings_get_source("blocks:block:$box2->bid:title", $box2->title), "The string for the second box title is still there.");
-    $this->assertTrue(i18nstrings_get_source("blocks:block:$box2->bid:body", $box2->body), "The string for the second box body is still there.");
-    // Test a block with filtering and input formats
-    $box3 = $this->i18nCreateBox(array(
-      'title' => '<div><script>alert(0)</script>Title</script>',
-      'body' => "One line\nTwo lines<script>alert(1)</script>",
-      'language' => I18N_BLOCK_LOCALIZE,
-    ));
-    $language = current($this->getOtherLanguages());
-    // We add language name to the title just to make sure we get the right translation later
-    $this->i18nstringsSaveTranslation("blocks:block:$box3->bid:title", $language->language, $box3->title . $language->name);
-    $this->i18nstringsSaveTranslation("blocks:block:$box3->bid:body", $language->language, $box3->body);
-    // This should be the actual HTML displayed
-    $title = check_plain($box3->title);
-    $body = check_markup($box3->body);
-    $this->drupalGet('');
-    $this->assertRaw($title, "Title being displayed for default language: " . $title);
-    $this->assertRaw($body, "Body being displayed for default language: " . check_plain($body));
-    $this->i18nGet($language);
-    $this->assertRaw($title . $language->name, "Translated title displayed with right filtering.");
-    $this->assertRaw($body, "Translated body displayed with right filtering.");
-  }
- 
-  /**
-   * Translate block fields to all languages
-   */
-  function i18nTranslateBlock($module, $delta, $fields = array('title', 'body')) {
-    foreach ($this->getOtherLanguages() as $language) {
-      foreach ($fields as $key) {
-        $text[$key] = $this->i18nstringsCreateTranslation("blocks:$module:$delta:$key", $language->language);
-      }
-      // Now check translated strings display on page
-      $this->i18nGet($language->language, '');
-      foreach ($text as $string) {
-        $this->assertText($string);
-      }
-      $translations[$language->language] = $text;
-    } 
-    return $translations;
-  }
-  /**
-   * Test creating custom block (i.e. box), moving it to a specific region and then deleting it.
-   */
-  function i18nCreateBox($box = array(), $region = 'left', $check_display = TRUE) {
-    // Add a new box by filling out the input form on the admin/build/block/add page.
-    $box += array(
-      'info' => $this->randomName(8),
-      'title' => $this->randomName(8),
-      'body' => $this->randomName(32),
-    );
-    $this->drupalPost('admin/build/block/add', $box, t('Save block'));
-    // Confirm that the box has been created, and then query the created bid.
-    $this->assertText(t('The block has been created.'), 'Box successfully created.');
-    $bid = db_result(db_query("SELECT bid FROM {boxes} WHERE info = '%s'", array($box['info'])));
-    // Check to see if the box was created by checking that it's in the database..
-    $this->assertNotNull($bid, 'Box found in database');
-    // Display the block on left region
-    $this->i18nUpdateBlockRegion('block', $bid, $region);
-    if ($check_display) {
-      // Confirm that the box is being displayed.
-      $this->assertText(check_plain($box['title']), 'Box successfully being displayed on the page.');
-    }
-    $box['bid'] = $block['delta'] = $bid;
-    $box['module'] = 'block';
-    return (object)$box;
-  }
-  /**
-   * Update block
-   */
-  function i18nUpdateBlock($module, $delta, $update = array()) {
-    $this->drupalPost("admin/build/block/configure/$module/$delta", $update, t('Save block'));
-    $this->assertText(t('The block configuration has been saved.'));
-  }
-  /**
-   * Update block region
-   */
-  function i18nUpdateBlockRegion($module, $delta, $region) {
-    // Set the created box to a specific region.
-    // TODO: Implement full region checking.
-    $edit = array();
-    $edit[$module . '_'. $delta .'[region]'] = $region;
-    $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
-    // Confirm that the box was moved to the proper region.
-    $this->assertText(t('The block settings have been updated.'), "Box successfully moved to $region region.");
-  }
-  /**
-   * Delete block
-   */
-  function i18nDeleteBlock($bid) {
-    // Delete the created box & verify that it's been deleted and no longer appearing on the page.
-    $this->drupalPost('admin/build/block/delete/'. $bid, array(), t('Delete'));
-    $this->assertRaw(t('The block %title has been removed.', array('%title' => $box['info'])), t('Box successfully deleted.'));
-    $this->assertNoText(t($box['title']), t('Box no longer appears on page.'));
-  }
-}   
\ No newline at end of file
diff --git a/sites/all/modules/i18n/tests/i18n_strings.test b/sites/all/modules/i18n/tests/i18n_strings.test
deleted file mode 100644
index ebab422..0000000
--- a/sites/all/modules/i18n/tests/i18n_strings.test
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Class for testing i18nstrings and modules using these features
- *
- * Tests basic API functions
- */
-
-require_once 'drupal_i18n_test_case.php';
-
-class i18n_Strings_Test extends Drupali18nTestCase {
-  
-  function getInfo() {
-    return array(
-      'name' => 'String translation API',
-      'group' => 'Internationalization',
-      'description' => 'User defined strings translation functions'
-    );
-  }
-
-  function setUp() {
-    parent::setUp('i18n', 'locale', 'i18nstrings');
-    $this->addLanguage('es');
-    $this->addLanguage('de');
-    // A language with two letter code may help too
-    $this->addLanguage('pt-br');
-    // Set path languages so we can retrieve pages in different languages
-    variable_set('language_negotiation', LANGUAGE_NEGOTIATION_PATH);
-    //variable_set('i18n_variables', array('site_name','site_frontpage',));
-  }
-
-  /**
-   * Test base i18nstrings API
-   */
-  function testStringsAPI() {
-    // Create a bunch of strings for three languages
-    $strings = $this->stringCreateAll(10);
- 
-    // Save source strings and store translations
-    foreach ($strings['en'] as $key => $string) {
-      $name = "test:string:$key:name";
-      i18nstrings_update($name, $string);
-      $count = $this->stringSaveTranslation($name, 'es', $strings['es'][$key]);
-      $count += $this->stringSaveTranslation($name, 'pt-br', $strings['pt-br'][$key]);
-      $this->assertEqual($count, 2, "Two translatins have been saved");
-    }
-    // Check translations
-    $language_list = language_list();
-    foreach (array('pt-br', 'es') as $lang) {
-      $language = $language_list[$lang];
-      foreach ($strings[$lang] as $key => $value) {
-        $name = "test:string:$key:name";
-        $translation = i18nstrings($name, 'NOT FOUND', $lang);
-        $this->assertEqual($translation, $value, "The right $language->language translation has been retrieved for $name, $translation");
-      }
-    }
-  }
-
-  /**
-   * Create strings for all languages
-   */
-  public static function stringCreateAll($number = 10, $length = 100) {
-    foreach (language_list() as $lang => $language) {
-      $strings[$lang] = self::stringCreateArray($number, $length);
-    }
-    return $strings;
-  }
-  /**
-   * Create a bunch of random strings to test the API
-   */
-  public static function stringCreateArray($number = 10, $length = 100) {
-    for ($i=1 ; $i <= $number ; $i++) {
-      $strings[$i] = self::randomName($length);
-    }
-    return $strings;
-  }
-  /**
-   * Create and store one translation into the db
-   */
-  public static function stringCreateTranslation($name, $lang, $length = 20) {
-    $translation = $this->randomName($length);
-    if (self::stringSaveTranslation($name, $lang, $translation)) {
-      return $translation;
-    }
-  }
-  /**
-   * Translate one string into the db
-   */
-  public static function stringSaveTranslation($name, $lang, $translation, $update = FALSE) {
-    $source = i18nstrings_get_source($name);
-    if ($source) {
-      if ($update) {
-        db_query("UPDATE {locales_target} SET translation = '%s' WHERE lid = %d AND language = '%s'", $translation, $source->lid, $lang);    
-      } else {
-        db_query("INSERT INTO {locales_target} (translation, lid, language) VALUES ('%s', %d, '%s')", $translation, $source->lid, $lang);
-      }
-      return db_affected_rows();
-    }
-    else {
-      return 0;
-    }
-  }
-}
\ No newline at end of file
diff --git a/sites/all/modules/i18n/tests/i18n_taxonomy.test b/sites/all/modules/i18n/tests/i18n_taxonomy.test
deleted file mode 100644
index f97f77d..0000000
--- a/sites/all/modules/i18n/tests/i18n_taxonomy.test
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Class for testing messaging module.
- *
- * Tests basic API functions
- */
-
-require_once 'i18n_strings.test';
-
-class i18n_Taxonomy_Test extends Drupali18nTestCase {
-
-  function getInfo() {
-    return array(
-      'name' => 'Taxonomy translation',
-      'group' => 'Internationalization',
-      'description' => 'Taxonomy translation functions'
-    );
-  }
-
-  function setUp() {
-    parent::setUp('i18nstrings', 'taxonomy', 'i18ntaxonomy');
-    $this->addLanguage('es');
-    $this->addLanguage('de');
-  }
-
-  function testTaxonomyTranslationAPI() {
-    // Create a vocabulary with some terms
-    $number = 4;
-    $vocab = $this->drupalCreateVocabulary(array('i18nmode' => I18N_TAXONOMY_LOCALIZE));
-    $this->assertEqual(i18ntaxonomy_vocabulary($vocab-vid), I18N_TAXONOMY_LOCALIZE, 'A vocabulary has been created and it is localizable.');
-    $terms = $this->drupalCreateTerms($number, array('vid' => $vocab->vid));
-    $this->assertEqual(count($terms), $number, "Four translatable terms have been created.");
-    // Create and Save Spanish translation for all of them
-    $count = 0;
-    $lang = 'es';
-    foreach ($terms as $term) {
-      $translations[$term->tid] = $this->randomName(10);
-      // Save Spanish translation
-      $translations[$term->tid] = $this->i18nstringsCreateTranslation("taxonomy:term:$term->tid:name", $lang);
-    }
-  }
-  // Create vocabulary with given fields
-  function drupalCreateVocabulary($vocab = array()) {
-    $vocab += array('name' => $this->randomName(10), 'description' => $this->randomName(20));
-    taxonomy_save_vocabulary($vocab);
-    return (object)$vocab;
-  }
-  // Create term with given fields
-  function drupalCreateTerms($number = 1, $data = array()) {
-    $list = array();
-    for ($i = 1; $i <= $number ; $i++ ) {
-      $term = $data + array('name' => $this->randomName(10), 'description' => $this->randomName(20));
-      taxonomy_save_term($term);
-      $list[] = (object)$term;
-    }
-    return $list;  
-  }
-}
\ No newline at end of file
diff --git a/sites/all/modules/i18n/tests/i18n_test.info b/sites/all/modules/i18n/tests/i18n_test.info
deleted file mode 100644
index a387afc..0000000
--- a/sites/all/modules/i18n/tests/i18n_test.info
+++ /dev/null
@@ -1,14 +0,0 @@
-name = Internationalization tests
-description = Helper module for testing i18n (do not enable manually)
-dependencies[] = locale
-dependencies[] = translation
-dependencies[] = i18n
-package = Testing
-core = 6.x
-
-; Information added by drupal.org packaging script on 2011-10-11
-version = "6.x-1.10"
-core = "6.x"
-project = "i18n"
-datestamp = "1318336004"
-
diff --git a/sites/all/modules/i18n/tests/i18n_test.module b/sites/all/modules/i18n/tests/i18n_test.module
deleted file mode 100644
index 85aea0f..0000000
--- a/sites/all/modules/i18n/tests/i18n_test.module
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- *   Helper module for testing i18n
- */
-
-// Add some multilingual variables, override existing ones from settings so
-// we have a known list and we don't need any addition to the settings file for testing i18n
-_i18n_test_variable_init();
-
-/**
- * Implementation of hook_init()
- */
-function i18n_test_init() {
-  // We just implement this hook so this one is loaded always on bootstap
-}
-
-/**
- * Set default multilingual variables and add any others defined by testing scripts
- *
- * More variables can be added using 'i18n_variables_test';
- */
-function _i18n_test_variable_init() {
-  global $conf;
-  $conf['i18n_variables'] = array_merge(array('site_name', 'site_frontpage'), variable_get('i18n_variables_test', array()));
-}
-
-/**
- * Implementation of hook_locale()
- */
-function i18n_test_locale() {
-  switch ($op) {
-    case 'groups':
-      return array('test' => t('Test'));
-    case 'info':
-      $info['test']['refresh callback'] = 'i18n_test_locale_refresh';
-      $info['test']['format'] = FALSE;
-      return $info;
-  }
-}
-
-/**
- * Locale refresh
- */
-function i18n_test_locale_refresh() {
-  return TRUE;
-}
\ No newline at end of file
diff --git a/sites/all/modules/imageapi/imageapi.info b/sites/all/modules/imageapi/imageapi.info
index c7de560..86d92d5 100644
--- a/sites/all/modules/imageapi/imageapi.info
+++ b/sites/all/modules/imageapi/imageapi.info
@@ -1,6 +1,6 @@
 name = ImageAPI
 description = ImageAPI supporting multiple toolkits.
-package = ImageCache
+package = Image
 core = 6.x
 php = 5.1
 
@@ -9,4 +9,3 @@ version = "6.x-1.10"
 core = "6.x"
 project = "imageapi"
 datestamp = "1305563215"
-
diff --git a/sites/all/modules/imageapi/imageapi_gd.info b/sites/all/modules/imageapi/imageapi_gd.info
index ccfa0aa..1393ab9 100644
--- a/sites/all/modules/imageapi/imageapi_gd.info
+++ b/sites/all/modules/imageapi/imageapi_gd.info
@@ -1,6 +1,6 @@
 name = ImageAPI GD2
 description = Uses PHP's built-in GD2 image processing support.
-package = ImageCache
+package = Image
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2011-05-16
@@ -8,4 +8,3 @@ version = "6.x-1.10"
 core = "6.x"
 project = "imageapi"
 datestamp = "1305563215"
-
diff --git a/sites/all/modules/imageapi/imageapi_imagemagick.info b/sites/all/modules/imageapi/imageapi_imagemagick.info
index 011f22d..93814de 100644
--- a/sites/all/modules/imageapi/imageapi_imagemagick.info
+++ b/sites/all/modules/imageapi/imageapi_imagemagick.info
@@ -1,6 +1,6 @@
 name = ImageAPI ImageMagick
 description = Command Line ImageMagick support.
-package = ImageCache
+package = Image
 core = 6.x
 
 
@@ -9,4 +9,3 @@ version = "6.x-1.10"
 core = "6.x"
 project = "imageapi"
 datestamp = "1305563215"
-
diff --git a/sites/all/modules/imagecache/imagecache.info b/sites/all/modules/imagecache/imagecache.info
index d1375cc..0c30f8f 100644
--- a/sites/all/modules/imagecache/imagecache.info
+++ b/sites/all/modules/imagecache/imagecache.info
@@ -1,6 +1,6 @@
 name = ImageCache
 description = Dynamic image manipulator and cache.
-package = ImageCache
+package = Image
 dependencies[] = imageapi
 core = 6.x
 
@@ -9,4 +9,3 @@ version = "6.x-2.0-rc1"
 core = "6.x"
 project = "imagecache"
 datestamp = "1337742655"
-
diff --git a/sites/all/modules/imagecache/imagecache_ui.info b/sites/all/modules/imagecache/imagecache_ui.info
index 28a3024..831858f 100644
--- a/sites/all/modules/imagecache/imagecache_ui.info
+++ b/sites/all/modules/imagecache/imagecache_ui.info
@@ -2,7 +2,7 @@ name = ImageCache UI
 description = ImageCache User Interface.
 dependencies[] = imagecache
 dependencies[] = imageapi
-package = ImageCache
+package = Image
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2012-05-23
@@ -10,4 +10,3 @@ version = "6.x-2.0-rc1"
 core = "6.x"
 project = "imagecache"
 datestamp = "1337742655"
-
diff --git a/sites/all/modules/lexicon/lexicon.info b/sites/all/modules/lexicon/lexicon.info
index 92a790d..7e07d1c 100644
--- a/sites/all/modules/lexicon/lexicon.info
+++ b/sites/all/modules/lexicon/lexicon.info
@@ -1,5 +1,6 @@
 name = Lexicon
 description = Maintain a lexicon on your site.
+package = Core - extended
 dependencies[] = taxonomy
 core = 6.x
 
@@ -9,4 +10,3 @@ version = "6.x-1.4"
 core = "6.x"
 project = "lexicon"
 datestamp = "1302799616"
-
diff --git a/sites/all/modules/lightbox2/lightbox2.info b/sites/all/modules/lightbox2/lightbox2.info
index cc606ed..3938d8b 100644
--- a/sites/all/modules/lightbox2/lightbox2.info
+++ b/sites/all/modules/lightbox2/lightbox2.info
@@ -1,6 +1,7 @@
 ; $Id: lightbox2.info,v 1.1.6.4 2008/07/14 11:51:34 snpower Exp $
 name = Lightbox2
 description = Enables Lightbox2 for Drupal
+package = User interface
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2010-09-24
@@ -8,4 +9,3 @@ version = "6.x-1.11"
 core = "6.x"
 project = "lightbox2"
 datestamp = "1285342563"
-
diff --git a/sites/all/modules/linkchecker/linkchecker.info b/sites/all/modules/linkchecker/linkchecker.info
index 909e60c..161261a 100644
--- a/sites/all/modules/linkchecker/linkchecker.info
+++ b/sites/all/modules/linkchecker/linkchecker.info
@@ -1,5 +1,6 @@
 name = Link checker
 description = "Periodically checks for broken links in node types, blocks and cck fields and reports the results."
+package = Core - extended
 core = 6.x
 
 ; Information added by Drupal.org packaging script on 2014-06-07
@@ -7,4 +8,3 @@ version = "6.x-2.8"
 core = "6.x"
 project = "linkchecker"
 datestamp = "1402132729"
-
diff --git a/sites/all/modules/node_clone/clone.info b/sites/all/modules/node_clone/clone.info
index a0c0b37..f5e2df7 100644
--- a/sites/all/modules/node_clone/clone.info
+++ b/sites/all/modules/node_clone/clone.info
@@ -1,6 +1,7 @@
 ; $Name$
 name = Clone module
 description = "Allows users to clone (copy then edit) an existing node."
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2011-07-01
@@ -8,4 +9,3 @@ version = "6.x-1.3"
 core = "6.x"
 project = "node_clone"
 datestamp = "1309483919"
-
diff --git a/sites/all/modules/recently_read/recently_read.info b/sites/all/modules/recently_read/recently_read.info
index 5b69061..e8ac000 100644
--- a/sites/all/modules/recently_read/recently_read.info
+++ b/sites/all/modules/recently_read/recently_read.info
@@ -1,11 +1,10 @@
 name = Recently read
 description = Tracks the history of recently read content by each user.
+package = Core - extended
 core = 6.x
-package = Other
 
 ; Information added by drupal.org packaging script on 2012-03-02
 version = "6.x-1.0-beta1"
 core = "6.x"
 project = "recently_read"
 datestamp = "1330713350"
-
diff --git a/sites/all/modules/role_delegation/role_delegation.info b/sites/all/modules/role_delegation/role_delegation.info
index 6fdbcf4..9c1b62f 100644
--- a/sites/all/modules/role_delegation/role_delegation.info
+++ b/sites/all/modules/role_delegation/role_delegation.info
@@ -1,6 +1,7 @@
 ; $Id: role_delegation.info,v 1.2 2008/06/12 04:00:35 davidlesieur Exp $
 name = "Role Delegation"
 description = "Allows site administrators to grant some roles the authority to assign selected roles to users."
+package = Core - extended
 core = "6.x"
 
 
@@ -9,4 +10,3 @@ version = "6.x-1.4"
 core = "6.x"
 project = "role_delegation"
 datestamp = "1291919534"
-
diff --git a/sites/all/modules/search_restrict/search_restrict.info b/sites/all/modules/search_restrict/search_restrict.info
index 494a306..22f3630 100644
--- a/sites/all/modules/search_restrict/search_restrict.info
+++ b/sites/all/modules/search_restrict/search_restrict.info
@@ -1,5 +1,6 @@
 name = Search Restrict
 description =  "Exclude specific content from search results if user doesn't have privileges."
+package = Core - extended
 dependencies[] = search  
 core = 6.x
 
@@ -8,4 +9,3 @@ version = "6.x-1.5"
 core = "6.x"
 project = "search_restrict"
 datestamp = "1346261003"
-
diff --git a/sites/all/modules/search_restrict/search_restrict_apache_solr/search_restrict_apache_solr.info b/sites/all/modules/search_restrict/search_restrict_apache_solr/search_restrict_apache_solr.info
index 736cf88..3b040ca 100644
--- a/sites/all/modules/search_restrict/search_restrict_apache_solr/search_restrict_apache_solr.info
+++ b/sites/all/modules/search_restrict/search_restrict_apache_solr/search_restrict_apache_solr.info
@@ -1,7 +1,8 @@
 name = Search Restrict Apache Solr
 description =  "Exclude specific content from Apache Solr search results if user doesn't have privileges."
+package = Core - extended
 dependencies[] = apachesolr
-dependencies[] = search_restrict  
+dependencies[] = search_restrict
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2012-08-29
@@ -9,4 +10,3 @@ version = "6.x-1.5"
 core = "6.x"
 project = "search_restrict"
 datestamp = "1346261003"
-
diff --git a/sites/all/modules/storm/storm.info b/sites/all/modules/storm/storm.info
index bebb282..73e3b5f 100644
--- a/sites/all/modules/storm/storm.info
+++ b/sites/all/modules/storm/storm.info
@@ -1,4 +1,4 @@
-name = SuiteDesk
+name = Storm
 description = "Project Management Application (base module - utility for other SuiteDesk modules)."
 core = 6.x
 package = Storm
@@ -8,4 +8,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormdok/stormdok.info b/sites/all/modules/storm/stormdok/stormdok.info
index 1c98bf0..1f77565 100644
--- a/sites/all/modules/storm/stormdok/stormdok.info
+++ b/sites/all/modules/storm/stormdok/stormdok.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Dok
+name = Storm Dok
 description = "Allows creation of documents about organizations, projects or tasks."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -6,3 +6,5 @@ dependencies[] = stormproject
 dependencies[] = stormtask
 package = Storm
 core = 6.x
+
+version = "6.x-2.2"
diff --git a/sites/all/modules/storm/stormevent/stormevent.info b/sites/all/modules/storm/stormevent/stormevent.info
index 68c43cf..b593e3b 100644
--- a/sites/all/modules/storm/stormevent/stormevent.info
+++ b/sites/all/modules/storm/stormevent/stormevent.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Event
+name = Storm Event
 description = "Allows creation of events and personal calendar."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -6,3 +6,5 @@ dependencies[] = stormproject
 dependencies[] = stormtask
 package = Storm
 core = 6.x
+
+version = "6.x-2.2"
diff --git a/sites/all/modules/storm/stormexpense/stormexpense.info b/sites/all/modules/storm/stormexpense/stormexpense.info
index b126016..68c6177 100644
--- a/sites/all/modules/storm/stormexpense/stormexpense.info
+++ b/sites/all/modules/storm/stormexpense/stormexpense.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Expense
+name = Storm Expense
 description = "Allows recording of expenses based on organizations, projects, tasks and tickets."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -13,4 +13,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormidea/stormidea.info b/sites/all/modules/storm/stormidea/stormidea.info
index ba3cc58..9d3c04c 100644
--- a/sites/all/modules/storm/stormidea/stormidea.info
+++ b/sites/all/modules/storm/stormidea/stormidea.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Idea
+name = Storm Idea
 description = "Allows creation of personal quick notes."
 dependencies[] = storm
 package = Storm
diff --git a/sites/all/modules/storm/storminvoice/storminvoice.info b/sites/all/modules/storm/storminvoice/storminvoice.info
index 03ff5be..6a932a8 100644
--- a/sites/all/modules/storm/storminvoice/storminvoice.info
+++ b/sites/all/modules/storm/storminvoice/storminvoice.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Invoice
+name = Storm Invoice
 description = "Allows invoices to be created based on organizations and projects."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -11,4 +11,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormnote/stormnote.info b/sites/all/modules/storm/stormnote/stormnote.info
index 325b7ec..31af21a 100644
--- a/sites/all/modules/storm/stormnote/stormnote.info
+++ b/sites/all/modules/storm/stormnote/stormnote.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Note
+name = Storm Note
 description = "Allows creation of notes about organizations, projects or tasks."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -12,4 +12,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormorganization/stormorganization.info b/sites/all/modules/storm/stormorganization/stormorganization.info
index 209e991..ee39151 100644
--- a/sites/all/modules/storm/stormorganization/stormorganization.info
+++ b/sites/all/modules/storm/stormorganization/stormorganization.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Organization
+name = Storm Organization
 description = "Allows storing of organizations for use within SuiteDesk"
 dependencies[] = storm
 package = Storm
@@ -9,4 +9,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormperson/stormperson.info b/sites/all/modules/storm/stormperson/stormperson.info
index 77a34e6..a527980 100644
--- a/sites/all/modules/storm/stormperson/stormperson.info
+++ b/sites/all/modules/storm/stormperson/stormperson.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Person
+name = Storm Person
 description = "Allows storage of people within organizations, and linking of these to Drupal user accounts."
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -10,4 +10,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormproject/stormproject.info b/sites/all/modules/storm/stormproject/stormproject.info
index 5af9449..e9476c6 100644
--- a/sites/all/modules/storm/stormproject/stormproject.info
+++ b/sites/all/modules/storm/stormproject/stormproject.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Project
+name = Storm Project
 description = "Allows recording of projects based on SuiteDesk Organizations"
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -10,4 +10,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormproject_clone/stormproject_clone.info b/sites/all/modules/storm/stormproject_clone/stormproject_clone.info
index 89f8135..02fb062 100644
--- a/sites/all/modules/storm/stormproject_clone/stormproject_clone.info
+++ b/sites/all/modules/storm/stormproject_clone/stormproject_clone.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Project Clone
+name = Storm Project Clone
 description = "Allows users to clone entire projects."
 dependencies[] = book
 dependencies[] = clone
diff --git a/sites/all/modules/storm/stormtask/stormtask.info b/sites/all/modules/storm/stormtask/stormtask.info
index 0287ec2..c34ded2 100644
--- a/sites/all/modules/storm/stormtask/stormtask.info
+++ b/sites/all/modules/storm/stormtask/stormtask.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Task
+name = Storm Task
 description = "Allows recording of tasks for SuiteDesk Organizations and Projects"
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -11,4 +11,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormteam/stormteam.info b/sites/all/modules/storm/stormteam/stormteam.info
index db12f54..0584696 100644
--- a/sites/all/modules/storm/stormteam/stormteam.info
+++ b/sites/all/modules/storm/stormteam/stormteam.info
@@ -1,5 +1,4 @@
-
-name = SuiteDesk Team
+name = Storm Team
 description = "Allows recording of teams made up of SuiteDesk Organizations and SuiteDesk People."
 core = 6.x
 package = Storm
@@ -13,4 +12,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormticket/stormticket.info b/sites/all/modules/storm/stormticket/stormticket.info
index 77052fb..aa91466 100644
--- a/sites/all/modules/storm/stormticket/stormticket.info
+++ b/sites/all/modules/storm/stormticket/stormticket.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Ticket
+name = Storm Ticket
 description = "Allows creation of tickets for SuiteDesk Projects and Tasks"
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -12,4 +12,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/storm/stormtimetracking/stormtimetracking.info b/sites/all/modules/storm/stormtimetracking/stormtimetracking.info
index 6d5955a..295d78f 100644
--- a/sites/all/modules/storm/stormtimetracking/stormtimetracking.info
+++ b/sites/all/modules/storm/stormtimetracking/stormtimetracking.info
@@ -1,4 +1,4 @@
-name = SuiteDesk Timetracking
+name = Storm Timetracking
 description = "Allows recording of times worked based on project, task and/or ticket"
 dependencies[] = storm
 dependencies[] = stormorganization
@@ -13,4 +13,3 @@ version = "6.x-2.2"
 core = "6.x"
 project = "storm"
 datestamp = "1375697500"
-
diff --git a/sites/all/modules/token/token.info b/sites/all/modules/token/token.info
index f88e9d5..b6b2268 100644
--- a/sites/all/modules/token/token.info
+++ b/sites/all/modules/token/token.info
@@ -1,5 +1,6 @@
 name = Token
 description = Provides a shared API for replacement of textual placeholders with actual data.
+package = Core - extended
 core = 6.x
 
 ; Information added by drupal.org packaging script on 2012-09-12
@@ -7,4 +8,3 @@ version = "6.x-1.19"
 core = "6.x"
 project = "token"
 datestamp = "1347470077"
-
diff --git a/sites/all/modules/token/tokenSTARTER.info b/sites/all/modules/token/tokenSTARTER.info
index 3f7e70b..611dab4 100644
--- a/sites/all/modules/token/tokenSTARTER.info
+++ b/sites/all/modules/token/tokenSTARTER.info
@@ -1,5 +1,6 @@
 name = TokenSTARTER
 description = Provides additional tokens and a base on which to build your own tokens.
+package = Core - extended
 dependencies[] = token
 core = 6.x
 
@@ -8,4 +9,3 @@ version = "6.x-1.19"
 core = "6.x"
 project = "token"
 datestamp = "1347470077"
-
diff --git a/sites/all/modules/token/token_actions.info b/sites/all/modules/token/token_actions.info
index 3e17f73..6f83551 100644
--- a/sites/all/modules/token/token_actions.info
+++ b/sites/all/modules/token/token_actions.info
@@ -1,5 +1,6 @@
 name = Token actions
 description = Provides enhanced versions of core Drupal actions using the Token module.
+package = Core - extended
 dependencies[] = token
 core = 6.x
 
@@ -8,4 +9,3 @@ version = "6.x-1.19"
 core = "6.x"
 project = "token"
 datestamp = "1347470077"
-
diff --git a/sites/all/modules/view_revisions_by_content_type/view_revisions_by_content_type.info b/sites/all/modules/view_revisions_by_content_type/view_revisions_by_content_type.info
index 15e2ede..ac9e0fd 100644
--- a/sites/all/modules/view_revisions_by_content_type/view_revisions_by_content_type.info
+++ b/sites/all/modules/view_revisions_by_content_type/view_revisions_by_content_type.info
@@ -1,6 +1,7 @@
 ; $Id: view_revisions_by_content_type.info,v 1.1 2009/09/27 22:07:01 wimleers Exp $
 name = View revisions by content type
 description = "Provides per-content type 'view revisions' permissions."
+package = Core - extended
 
 core = 6.x
 
@@ -9,4 +10,3 @@ version = "6.x-1.1"
 core = "6.x"
 project = "view_revisions_by_content_type"
 datestamp = "1288362052"
-
diff --git a/sites/all/modules/vppr/vppr.info b/sites/all/modules/vppr/vppr.info
index 0edb4c4..a58afb1 100644
--- a/sites/all/modules/vppr/vppr.info
+++ b/sites/all/modules/vppr/vppr.info
@@ -1,5 +1,6 @@
 name = Vocabulary Permissions Per Role
 description = "Allow adding to/editing terms of/removing terms from vocabularies per role."
+package = Core - extended
 core = 6.x
 dependencies[] = taxonomy
 
@@ -9,4 +10,3 @@ version = "6.x-1.1"
 core = "6.x"
 project = "vppr"
 datestamp = "1349516215"
-
diff --git a/sites/all/modules/watcher/watcher.info b/sites/all/modules/watcher/watcher.info
index b5d03ce..0ac01d1 100644
--- a/sites/all/modules/watcher/watcher.info
+++ b/sites/all/modules/watcher/watcher.info
@@ -1,7 +1,7 @@
 ; $Id: watcher.info,v 1.2.4.2 2009/02/26 17:03:48 solipsist Exp $
 name = "Watcher"
 description = "Watcher enables your site's users to watch nodes for changes and new comments and be notified about them."
-package = Other
+package = Core - extended
 core = 6.x
 dependencies[] = node
 dependencies[] = token
@@ -11,4 +11,3 @@ version = "6.x-1.4"
 core = "6.x"
 project = "watcher"
 datestamp = "1288126235"
-