Moved the contents of nef to the top-level