Code org and cleanup for upcoming 1.5 release