Mered the old project with the new one that supports working wihtout ADB