Made a more logical build ecosystem