Starting to break stuff into a more modular structure (not such a big deal now, but will help the more functionality we add).