Updated make to put output files in their new location.
More build restructuring.
Merge branch 'reorganize' of github.com:XIA-Project/xia-core into reorganize