Restructure the dirs