moved current classes from 'objects' to 'core'