added modules and classes and other such things