Nadia#3

Nadia's 3rd puzzle plus some file relocations