restructure make
make even more pretty
copy results from container manually