Changed bean layer to layout
Changed Definitions class name to SNWFDefinitions