changed old build structure to new