finished refactoring for removing all swing components from library