Directory restructure
Revert to old dir structure