moved some classes to nested class in package ex4_2