Restructure files again