renamespaced and made Unity compatible