Added data directory
Added border around output
Separated templates\nStore results