Minor improvements. Moving old code to old_ directories. To be deleted in the future.