Changed to two seperate projects