Project reorganisation
Adding clause types