Readapt structure

Folder to keep files separated.