Continuing to restructure, adding code outlines

So far leaving all the -context folders, haven't checked to see if anything in there is necessary or it's all redundant.  Added in most getters, setters, and constructors, and Jon's pseudocode for reference.