Package reorganization and distutils compatibility.
File rearrangement.