minor reorganization
moved getState/setState to Skater and minor reorganization