Reorganization of the repository
Superb rebase, with features to be implemented