Project cleaning
Revert "Project cleaning"

This reverts commit d62e98fef70b4de51ed2aeeb2d264f2503bca456.