renamed classes, set up dependencies from core project