Changed stuff to be project oriented