fixing build with subfolders