Revert "Massive loc refactor REVERTED"

This reverts commit 567c7d53fdd8bbaef6dffe538881f9fc1ac5b1e7.
Restored mess by copying last sprint