refactoring container code
= renaming folder/filter container containers