*manuelTorrealba: rearrangement of files inside ./src
folder.