All versions in enum, cleaner, package reorg, NS.java updated