refactor package structure

package object scala and package scala now can coexist