Cleaned and relocated some code
Cleaned and relocated some code

fiveofeight/mumbledj,GabrielPlassard/mumbledj,pzduniak/mumbledj,MrKrucible/mumbledj,r3valkyrie/mumbledj,RichardNysater/mumbledj,matthieugrieger/mumbledj,Gamah/mumbledj