Refactor package structure
change layout and doing some refactor