small reorganisation
playing with bounce demo
start of components