structure; Makefiles etc.
concluding merge
try to fix compile errors on build server
resolved conflicts