Revert "Updated most files"

This reverts commit 24de5cdfb6df58068a8302a2f10ce7ae20bd1412.
Include of the solution worked out together