Moved Line and Circle classes into the main class.