Reorganisation of constants.
Fixing dependency version.
Introduce new pattern namespace.