Went to a class. naming convention for all classes
Added class. requires
Merge branch 'refs/heads/dev-1.1.0' into shortcodes

* refs/heads/dev-1.1.0:
  Went to a class. naming convention for all classes