Added new folder for quick solution, lots of refactoring