Restructure repo layout to fix build problem