Checkpoint 3 + General

Relocated files + updates. Added ranking code.