Fixed module call, moved Module-related functions to one class.