Moved scenarios inside a dedicated package