Added singleton support to the Core class, and removed the Folder class.