This reverts commit e62a85cf6f, reversing changes made to 2660c2e21d.
e62a85cf6f
2660c2e21d
`app/` means we want to merge it into our application there. `addon` means give it its own module namespace, which is what we wanted.