directory structure and make files adjustments, workspace fixes