Fixed folders and proj