Moved some classes and packages to main from test