sort some packages
move some basic packages into their own module