Files reorganization to have a cleaner repo and enable further improvements later.
This will create a new commit in order to revert the existing changes.
