[Archi] Change folder and files architecture