Short Facility Grammar Change

Changed the syntax of short facility module to use the facility declaration rule

Pivotal Story: Short Facility Module Grammar Change
Pivotal Story Number: #60524624