Fix classes, singletons, entry point