Change Module to Class