moving classes into spike package, modifying class to check class and pass