Organized a bit the folder structure.