Fixed custom types and moved common ones into types.py.

Fixed custom types and moved common ones into types.py. #640