Restructured code so no complex logic is located in header files. Added SaveLoadTest base skill for unit test.