A ton more cleanup and re-arranging. Also made files lint free