Moved the externally facing parts together.