Reorganized solution and added Zeroth project