Modules instead of Classes