refactoring continued, extacting all swing components from the library part