MashProjectTools restructuring