Merge "Revert "reorg file structure to match it on GitHub""