Reorganization and simplification of the source tree
Reorganization and simplification of the source tree