restructured directory tree

I'll add a commit in next one to explain new directory
tree.