Full reorganize for Update 1.6.2

Reorganizing the whole workspace.
Because the workspace similar to Pahimars doesn't get supportet
anywhere.