Module additional folders and classes

UPGRADING. VISIT GENERATOR LATER