Source tree reorg and arch cleanups