Directory tree rearrangement
Code total rewrite