Moved files into HelperClass folder