restructure the dir