turned modules into classes