typing added to various classes
packages with multiple classes split into separate files