Merging to Master **Code Re-Org Kickoff**

Made separate class files for each display pane in preparation for the
code re-org that will now take place.