Reworking source code structure.