Remove nn paths from lib
Remove legacy code
Working on increasing productivity