Moved Core classes into correct folder