changed package name to avoid duplicate classes