restructure of the project