Tweak ordering
refactor package structure