Structure changes

..just a plan for the future.