Added new package groups source list section and refactored source list creation code