moved module definitions to the CLASSES folder