Change Class to Module