Fixing container issues from previous merge. All "inner" classes should be changed to "container". This is to bring in some code conventinos from OpenFEC.