more extract method
extract new classes to their own files