Drag'n'dropping of dir hierarchy
Some changes due to PEP8