Restructure projects + fix build