Initial commit of refactored source tree