moved classes, changed dependencies