The next-to-final stuff. Source files and layout updated