Fixed up sessions and some of the naming and locations of files