Fixed some annotations to stop zend studio warnings and moved the Module file to allow it work within composer