Add projects, big refactor