Split off types into separate unit