Organized project better, minor bugfixes for the staticwrestlereitor