Restructured entire project