Moved stuff out of the src folder, made it really hard to use the repo as a submodule