project rearranged to improve build workflow.