re-organizes most files