Project files up to date and reorganized.
Fixed conflict.