Project restructuring & fixtures