refactor structure

refactor package to original author