Restructure files