Overhauled solution and folder structure completely to be tidier