Improvements and bugs fixed

Total separation of public and internal assemblies, with private and public units and wizards.
Issues fixed: #304 #300 #298