Updated header comments. Import clenaup and reorganizing