Refactoring: moved classes related to builders in separate package