Added some structure & logic
Hey ! A useless Commit message