A little more restructuring to avoid the idiotic installation process I saw in another project.