Fix component composition

Component composition is messed up at the moment and components are all over the place.

This issue reorganizes the components in src/ui folder so that they make sense.