Restructure dir
restructure dir