adding classes, functions; moving sensitive variables to a config file