rewiring some components

**DO NOT MERGE**