Change Non Static Class to Static Class