Fixed project organization.