Small restructuring of project