Check if we need to move stuff

[MathyV]

Staking-specific stuff that might still be in main.* that needs to move to core.* or own class files.