Refactor packages

Signed-off-by: Moose517 <moose51789@gmail.com>