moving each component to dedicated space
cleanup