simplifing name space (part1)
simplifing name space (part 2)
refactor + fix help