more restructure of the project