moved some classes to own table related package