Fixed imports (removed lib prefixes)
Fixed registration of fake entry points