moved classes from common library