refactor package structure

fixed issue data being loaded twice