Changed package name and made vars type final