Merging of Standalone code with Hybrid project