Fix double-linking issue (I think) by simplifying builds/ structure.