Restructuralization of packages.
Other minor changes.