Sources relocated corresponding to common structure.
Some fixes.