Beginning of Competition Support

Renamed a bunch of stuff to make sense in the future;
Started competition support;