Refactor a bit just to make it work correctly.
Not needed
Moved to bin folder