build structure refactoring finished