small restructure of project