Rename components

Refactors code closer to our desired architecture.