Restructured files and a bit for Actions and Messages.