* Move auxiliary classes to a separate file.