Restructure the files structure