Oh ! I hadn't used refactoring. I have to follow the steps shown [here](https://www.youtube.com/watch?v=tHdt11WDq2o) right ? Also can I close this PR create a new PR with the changes ? This one is getting quite clumsy.