Changed some modules into classes, added if/configs