restructing the dir.