Module and Scene classes added