Restructuring source tree. Build probably still broken.