Clean up of code

Cleaned up some classes
Moved functionalities into more appropriate methods/classes
Reverted BaseSWGCommand
Diff is empty workaround
Last step