Moved some files in the source. Changed some variables.
More of a source cleanup than bugfixing/feauture adding.