Updating to module-based dependencies for better management.
Messing around further.
Full refactor to modularized builds.