Reorganized the solution

- Making the world a cleaner place ;)