update folder structure
fix build