restructure directories

Restructure directories