Restructure directories
Merge