moving support classes from other packages