Started to refactor build system.