#8 Revert changes in packages