Reorganised some files. Continuing tutorial.