Single module for the various small components
Update todo
Component API macro
Structure tweaking