big refactor - changing structure to make more sense, and gathering code together into fewer, more intuitive files