Added project organization
Fixed naming in recipes