Separated John McErlain's code base into separate folder