source dirs renamed.
sources grouped in folders.