Restructured the whole thing, and set up the package structure to allow things to work well when referencing different submodules.