Restructured files to reduce the number of init*.el files