Restructure of project