Moved classes to somewhere with less dependencies.