Refactoring - packages, regarding #566.