continued massive re-arrangement of workspace

Moved packages around; started developing helper classes to hold all the
arrays of stuff that were cluttering up the main class.