restructured the package to prevent some random iface kind bug