Restructure the code to fit to latest nls tooling