Moved contrib modules to modules/contrib. Added features module and contrib/features directory.