Better strucutre of package.