Added raise-on and anticipate
cleaned up project folder