Moved Contrib modules to CONTRIB directory
updated configuration