ReFactoring

Starting to change stuff to work for Minorgliches server