!!! Major reorganization of the project

MUST pull from this commit before making any changes on the older
versions !!!!