changed package namespace to comply with conventions