I Moving trunk to old branch to do a merge
re-organization and clean-up
Updated NobleCoder
re-organization