Updates .gitmodules
Removes submodule
Removes submodule from .gitmodule
Moves settings of elements in individual subfolders for better overview