Moved classes to other packages (more logical structure).