Restructure entire project