restructurated ndlite
before branching