moved utils into commons, updated build files