Putting Max's files into overall skeleton.