change stupid package naming convention and add initial hockey player and other objects