Final step of the major refactoring (fixed tons of references that had broken with the refactoring)

On this version all unit tests that were passing on the previous version are now passing
moved non-used jade files to the /_Old_To_Delete_Soon folder