restructuring project to make builds easier