Nest class methods under class << self

Change-Id: I2b255b449378b0b4af9b0576add1840f478a4e6a
Reviewed-on: http://gerrit.causes.com/37392
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>