Starting to work in Dir sources + Code cleaning