Packages and modules reorganized