Changed folder structure and added in test project and datalayer project