Rename variables and change directory layout.
Solve problem with variable printing.