reworked base skeleton and decoupled components