Version 2.2

Fix some more restructure items