move baseimage stuff to own project