Moved stuff out of the src folder, made it really hard to use the repo as a submodule
Merge remote-tracking branch 'origin/master'