Restructure the project folloing osdu remcommendation