[GF] Fixing poject structure and initial crash issues