Refactoring introducing Module and CallableItem