Modified gr36, removed unwanted files and changed cmake