re-organize code structure. Use new codebase as default. obsolete old codebase