Reorganized and simplified project