better directories structure
Merge branch 'reconstruct_dirs'