Relocating the Code folder to avoid inconsistences.
Adding more logging entries
Addressing issues.