Remove unnecessary comments, add new structure of the packages.