rework of deployment,test and filestructure