Update and rename type.py to types.py