Move builder. Now it's a new sub-project